From b68a266a734193dfeee8d9f52b9888b2798eb50c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 12 Apr 2013 14:06:20 +0400
Subject: remove no_cache_incantation()

---
 include/functions.php | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 4ac4e0968..31a4c1f2d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2929,15 +2929,6 @@
 		exit;
 	}
 
-	// from http://developer.apple.com/internet/safari/faq.html
-	function no_cache_incantation() {
-		header("Expires: Mon, 22 Dec 1980 00:00:00 GMT"); // Happy birthday to me :)
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); // always modified
-		header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0"); // HTTP/1.1
-		header("Cache-Control: post-check=0, pre-check=0", false);
-		header("Pragma: no-cache"); // HTTP/1.0
-	}
-
 	function format_warning($msg, $id = "") {
 		global $link;
 		return "<div class=\"warning\" id=\"$id\">
-- 
cgit v1.2.3-54-g00ecf


From bb399c62712cfe99503d7d92bbeb8afef1c10918 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 12 Apr 2013 14:14:11 +0400
Subject: add cache-control: public to the login page so that firefox would
 bother making a thumbnail

---
 include/functions.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 31a4c1f2d..f5685b89a 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2925,6 +2925,8 @@
 	}
 
 	function render_login_form($link) {
+		header('Cache-Control: public');
+
 		require_once "login_form.php";
 		exit;
 	}
-- 
cgit v1.2.3-54-g00ecf


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 ++++++++++++++++++++++++++++++++----
 config.php-dist           |  7 +++++++
 include/crypt.php         | 36 ++++++++++++++++++++++++++++++++++++
 include/functions.php     | 12 ++++++++++--
 include/rssfuncs.php      |  9 ++++++++-
 include/sanity_check.php  |  8 ++++++++
 include/sanity_config.php |  4 ++--
 install/index.php         | 27 +++++++++++++++++++++++++++
 8 files changed, 130 insertions(+), 9 deletions(-)
 create mode 100644 include/crypt.php

(limited to 'include/functions.php')

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");
diff --git a/config.php-dist b/config.php-dist
index eb3339742..fc999354b 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -24,6 +24,13 @@
 	// You need to set this option correctly otherwise several features
 	// including PUSH, bookmarklets and browser integration will not work properly.
 
+	define('FEED_CRYPT_KEY', '');
+   // Key used for encryption of login/passwords for password-protected feeds
+   // in the database. A string of 24 random characters. If left blank, encryption
+	// is not used. Requires mcrypt functions.
+	// Warning: changing this key will make your stored feed passwords impossible
+	// to decrypt.
+	
 	define('SINGLE_USER_MODE', false);
 	// Operate in single user mode, disables all functionality related to
 	// multiple users and authentication. Enabling this assumes you have
diff --git a/include/crypt.php b/include/crypt.php
new file mode 100644
index 000000000..f06483ef1
--- /dev/null
+++ b/include/crypt.php
@@ -0,0 +1,36 @@
+<?php
+	function decrypt_string($str) {
+		$pair = explode(":", $str);
+
+		if (count($pair) == 2) {
+			@$iv = base64_decode($pair[0]);
+			@$encstr = base64_decode($pair[1]);
+
+			if ($iv && $encstr) {
+				$key = hash('SHA256', FEED_CRYPT_KEY, true);
+
+				$str = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $encstr,
+					MCRYPT_MODE_CBC, $iv);
+
+				if ($str) return rtrim($str);
+			}
+		}
+
+		return false;
+	}
+
+	function encrypt_string($str) {
+		$key = hash('SHA256', FEED_CRYPT_KEY, true);
+
+		$iv = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128,
+			MCRYPT_MODE_CBC), MCRYPT_RAND);
+
+		$encstr = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $str,
+			MCRYPT_MODE_CBC, $iv);
+
+		$iv_base64 = base64_encode($iv);
+		$encstr_base64 = base64_encode($encstr);
+
+		return "$iv_base64:$encstr_base64";
+	}
+?>
diff --git a/include/functions.php b/include/functions.php
index f5685b89a..73ed97d08 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1614,12 +1614,20 @@
 			"SELECT id FROM ttrss_feeds
 			WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]);
 
+		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 (db_num_rows($result) == 0) {
 			$result = db_query($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"]."', '$url',
-				'[Unknown]', $cat_qpart, '$auth_login', '$auth_pass', 0)");
+				'[Unknown]', $cat_qpart, '$auth_login', '$auth_pass', 0, $auth_pass_encrypted)");
 
 			$result = db_query($link,
 				"SELECT id FROM ttrss_feeds WHERE feed_url = '$url'
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 6e3ef4cf1..859c575cc 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -203,7 +203,7 @@
 		$result = db_query($link, "SELECT id,update_interval,auth_login,
 			feed_url,auth_pass,cache_images,last_updated,
 			mark_unread_on_update, owner_uid,
-			pubsub_state
+			pubsub_state, auth_pass_encrypted
 			FROM ttrss_feeds WHERE id = '$feed'");
 
 		if (db_num_rows($result) == 0) {
@@ -218,6 +218,8 @@
 		$mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result,
 			0, "mark_unread_on_update"));
 		$pubsub_state = db_fetch_result($result, 0, "pubsub_state");
+		$auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result,
+			0, "auth_pass_encrypted"));
 
 		db_query($link, "UPDATE ttrss_feeds SET last_update_started = NOW()
 			WHERE id = '$feed'");
@@ -225,6 +227,11 @@
 		$auth_login = db_fetch_result($result, 0, "auth_login");
 		$auth_pass = db_fetch_result($result, 0, "auth_pass");
 
+		if ($auth_pass_encrypted) {
+			require_once "crypt.php";
+			$auth_pass = decrypt_string($auth_pass);
+		}
+
 		$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
 		$fetch_url = db_fetch_result($result, 0, "feed_url");
 
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 69309290e..b4102d234 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -67,6 +67,14 @@
 				array_push($errors, "Javascript cache is not writable (chmod -R 777 ".CACHE_DIR."/js)");
 			}
 
+			if (strlen(FEED_CRYPT_KEY) != 24) {
+				array_push($errors, "FEED_CRYPT_KEY should be exactly 24 characters in length.");
+			}
+
+			if (strlen(FEED_CRYPT_KEY) != 0 && !function_exists("mcrypt_decrypt")) {
+				array_push($errors, "FEED_CRYPT_KEY requires mcrypt functions which are not found.");
+			}
+
 			if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) {
 				array_push($errors,
 					"Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh");
diff --git a/include/sanity_config.php b/include/sanity_config.php
index cb1c1e8ca..0c829981e 100644
--- a/include/sanity_config.php
+++ b/include/sanity_config.php
@@ -1,3 +1,3 @@
-<?php # This file has been generated at:  Mon Apr 1 18:30:54 IDT 2013
+<?php # This file has been generated at:  Sat Apr 13 17:41:19 MSK 2013
 define('GENERATED_CONFIG_CHECK', 26);
-$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_PORT', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>
+$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_PORT', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>
diff --git a/install/index.php b/install/index.php
index 3b6a1f544..1aae5da83 100644
--- a/install/index.php
+++ b/install/index.php
@@ -10,6 +10,25 @@
 <body>
 
 <?php
+	function make_password($length = 8) {
+
+		$password = "";
+		$possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ*%+^";
+
+   	$i = 0;
+
+		while ($i < $length) {
+			$char = substr($possible, mt_rand(0, strlen($possible)-1), 1);
+
+			if (!strstr($password, $char)) {
+				$password .= $char;
+				$i++;
+			}
+		}
+		return $password;
+	}
+
+
 	function sanity_check($db_type) {
 		$errors = array();
 
@@ -108,6 +127,12 @@
 
 		$finished = false;
 
+		if (function_exists("mcrypt_decrypt")) {
+			$crypt_key = make_password(24);
+		} else {
+			$crypt_key = "";
+		}
+
 		foreach ($data as $line) {
 			if (preg_match("/define\('DB_TYPE'/", $line)) {
 				$rv .= "\tdefine('DB_TYPE', '$DB_TYPE');\n";
@@ -123,6 +148,8 @@
 				$rv .= "\tdefine('DB_PORT', '$DB_PORT');\n";
 			} else if (preg_match("/define\('SELF_URL_PATH'/", $line)) {
 				$rv .= "\tdefine('SELF_URL_PATH', '$SELF_URL_PATH');\n";
+			} else if (preg_match("/define\('FEED_CRYPT_KEY'/", $line)) {
+				$rv .= "\tdefine('FEED_CRYPT_KEY', '$crypt_key');\n";
 			} else if (!$finished) {
 				$rv .= "$line\n";
 			}
-- 
cgit v1.2.3-54-g00ecf


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 +-
 include/functions.php  | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'include/functions.php')

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);
 
diff --git a/include/functions.php b/include/functions.php
index 73ed97d08..1b6b3e820 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1622,6 +1622,8 @@
 			$auth_pass_encrypted = 'false';
 		}
 
+		$auth_pass = db_escape_string($this->link, $auth_pass);
+
 		if (db_num_rows($result) == 0) {
 			$result = db_query($link,
 				"INSERT INTO ttrss_feeds
-- 
cgit v1.2.3-54-g00ecf


From 96de8fea677d4c031700cadea16fc8c7b0de0172 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 14 Apr 2013 09:11:02 +0400
Subject: subscribe_to_feed: fix typo

---
 include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 1b6b3e820..e2357f6c0 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1622,7 +1622,7 @@
 			$auth_pass_encrypted = 'false';
 		}
 
-		$auth_pass = db_escape_string($this->link, $auth_pass);
+		$auth_pass = db_escape_string($link, $auth_pass);
 
 		if (db_num_rows($result) == 0) {
 			$result = db_query($link,
-- 
cgit v1.2.3-54-g00ecf


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 +-
 include/functions.php         |  42 +++
 include/rssfuncs.php          |  11 +-
 lib/floIcon.php               | 843 ++++++++++++++++++++++++++++++++++++++++++
 schema/versions/mysql/117.sql |   7 +
 5 files changed, 903 insertions(+), 5 deletions(-)
 create mode 100644 lib/floIcon.php
 create mode 100644 schema/versions/mysql/117.sql

(limited to 'include/functions.php')

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\"
diff --git a/include/functions.php b/include/functions.php
index e2357f6c0..1ae5bbbe2 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -508,8 +508,50 @@
 					}
 				}
 			}
+            return $icon_file;
 		}
 	}
+	
+	function calculate_avg_color($iconFile) {
+		
+		require_once "lib/floIcon.php";
+		
+		$imgInfo = @getimagesize($iconFile);
+        
+		if(strtolower($imgInfo['mime'])=='image/vnd.microsoft.icon') {
+			$ico = new floIcon();
+			@$ico->readICO($iconFile);
+			//TODO: error logging
+			if(count($ico->images)==0)
+				return null;
+			else {
+				$image = @$ico->images[count($ico->images)-1]->getImageResource();
+			}
+			$type = "ico";
+			}
+		elseif(strtolower($imgInfo['mime'])=='image/png') {
+            $image = imagecreatefrompng($iconFile);
+			$type = 'png';
+		}
+		elseif(strtolower($imgInfo['mime'])=='image/jpeg') {
+			$image = imagecreatefromjpeg($iconFile);
+			$type = 'jpg';
+		}
+		elseif(strtolower($imgInfo['mime'])=='image/gif') {
+			$image = imagecreatefromgif($iconFile);
+			$type = 'gif';
+		}
+		//TODO: error logging
+		if (is_null($image))
+			return null;
+		$width = imagesx($image);
+		$height = imagesy($image);
+		$pixel = imagecreatetruecolor(1, 1);
+		imagecopyresampled($pixel, $image, 0, 0, 0, 0, 1, 1, $width, $height);
+		$rgb = imagecolorat($pixel, 0, 0);
+		$color = imagecolorsforindex($pixel, $rgb);
+		return $color;
+	}
 
 	function print_select($id, $default, $values, $attributes = "") {
 		print "<select name=\"$id\" id=\"$id\" $attributes>";
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 859c575cc..498700906 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -408,9 +408,14 @@
 			}
 
 			if ($favicon_needs_check) {
-				check_feed_favicon($site_url, $feed, $link);
-
-				db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
+				$favicon_file = check_feed_favicon($site_url, $feed, $link);
+                if ($favicon_file) {
+				    $favicon_color = calculate_avg_color($favicon_file);
+                    if (is_array($favicon_color))
+                        $favicon_colorstring = ",favicon_avg_color = '" . implode("|", array_slice($favicon_color, 0, 3)) . "'";
+                }
+				
+				db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring
 					WHERE id = '$feed'");
 			}
 
diff --git a/lib/floIcon.php b/lib/floIcon.php
new file mode 100644
index 000000000..e9498b0e5
--- /dev/null
+++ b/lib/floIcon.php
@@ -0,0 +1,843 @@
+<?php
+/***************************************************************************
+ *  Original floIcon copyright (C) 2007 by Joshua Hatfield.                *
+ *                                                                         *
+ *  In order to use any part of this floIcon Class, you must comply with   *
+ *  the license in 'license.doc'.  In particular, you may not remove this  *
+ *  copyright notice.                                                      *
+ *                                                                         *
+ *  Much time and thought has gone into this software and you are          *
+ *  benefitting.  We hope that you share your changes too.  What goes      *
+ *  around, comes around.                                                  *
+ ***************************************************************************
+
+Version 1.1.1:
+Date: 2009-03-16
+
+Changes:
+I was a little hasty on that last update.  A couple new bugs from 1.1.0 have
+been fixed.  
+
+Version 1.1.0:
+Date: 2009-03-16
+
+Changes:
+Added Vista support.  
+Fixed a number of minor bugs.  Many thanks to Dvir Berebi for pointing
+        them out.
+
+Version 1.0.5:
+Date: 2009-03-15
+
+Changes:
+Fixed bug when operating on low bit count images (1 or 4) with odd dimensions.
+
+Version 1.0.4:
+Date: 2007-05-25
+
+Changes:
+Made function not break quite so bad when reading a PNG file on a Vista icon.
+        Now, you shouldn't be loading Vista icons anyways, but since I'm trying to
+        upgrade to Vista compatible and I need a comparison, I've got to.
+
+Version 1.0.3:
+Date: 2007-05-25
+
+Changes:
+Okay, this one was just stupid.  When adding large image support, I messed up
+        and when reading, it doubled the image size.  Now, it's fixed.
+I took the opportunity to also add a dummy AND map for 32 images on those
+        readers who might be looking for it (though it's not supposed to be used.)
+
+Version 1.0.2:
+Date: 2007-05-24
+
+Sorry about two versions so quickly back to back, but something needed to be
+done with speed...things were getting too slow.  I'm sure you'll be okay.
+
+Changes:
+Told palette determination to stop at 257 colors or is 32 bit because the
+        palette is not used at that point and gets really slow when it starts
+        getting into the high numbers, for instance, in photographs or gradient
+        truecolor images with lots of unique colors.
+After experimenting, it appears that Windows XP does in fact support 256x256
+        images and larger by setting the entry value to 0 in the 1 byte that holds
+        that value and storing the true dimentions in the image header later.  Of
+        course, it still doesn't use these images in normal operation.  XP will
+        resize these and use them if no other images are available.
+Wrapped main documentation (this) to the 80th column for easier reading.
+
+Version 1.0.1:
+Date: 2007-05-23
+
+Thank you everyone for actively using the implementation on my site and
+illuminating me very quickly to a number of glaring bugs in this class.
+
+Changes:
+Added version history.
+Fixed bug with non-standard sizes in AND map reading AND writing.
+Fixed bug with palette images using non-black color in backgrounds.
+Fixed bug with height/width reversal reading files.
+
+
+Version 1.0.0:
+Date: 2007-05-17
+Original release date.
+
+
+Foreword:
+If you are simply in the effort of making an ICO file, may I recommend visiting
+my site, http://www.flobi.com/ , and clicking on floIcon.  I have a fully
+functional implementation (on which the sample.php is based) where you can also
+see recent icons submitted by other visitors.  No registration required, no
+intrusive ads.  (As of this writing, there aren't actually any ads at all, I
+might add google ads at some point.)
+
+If you are trying to get an idea of how ICO files, work, may I recommend the
+page I used, http://www.daubnet.com/formats/ICO.html .  It does not fully cover
+icon files, but it does a very good job of what it does.  Any additional
+information, I will try to post at
+http://www.flobi.com/test/floIcon/more_on_icons.php for your convenience.
+
+If you are trying to get an idea of how image resource files work, I recommend
+ANY other class that deals with images.  This class essentially plots points on
+the image, and that's not perticularly advanced.
+
+For any purpose, I wish you luck and feel free to contact me with any bugs,
+comments, questions, etc.  - Flobi
+
+Summary:
+This class parses ICO files.  It reads directly from the ICO file, headers
+first, so that if you are only retrieving 1 image, the entire ICO file need not
+be parsed.  It supports merging ICO files.  It supports adding PHP image
+resources as new images to the file.  It has an export capability that can
+easily be written to a new (or the same) ICO file for saving ICO files.  All
+sizes from 1x1 to 255x255 pixels and 1, 4, 8, 24 (plus transparency) and 32 bit
+images are supported.  Image retrieval by size is supported.
+
+Included is a fully functional sample that allows users to upload ICO, GIF,
+JPEG and PNG files into a session icon file as well as remove images from the
+file and download the completed file (sample.php).
+
+Known Limitations: Does not support Vista icons.  Does not support inversion
+palette method (because of the limitations of the PHP image resource).
+
+Addendum on Limitations:
+Windows Vista has added support for 256x256 size icons and now stores files as
+PNG's.  This class is for older ICO files.  A new class is currently under
+development that supports the new Windows Vista format.
+
+Palette inversion (my name for this technique) is the technique of using a black
+pixel (0, 0, 0) with a 1 "AND" pixel.  White pixels with a 1 "AND" show
+transparent (or "don't" show).  Black pixels with a 1 "AND" show inverted
+(sometimes).  Because this method isn't uniformly supported or documented and
+the PHP image resource doesn't support it, I have decided to not as well.  This
+does not apply to 32 bit images which include alpha transparency and no AND map.
+
+Though other functions exist, these are the only ones I believe offer usefulness
+to be public.
+floIcon public functions:
+        readICO($file, $offset = 0)
+                Loads the icon from the specified filepath ($file) starting at the
+                specified file offset ($offset).  This function MERGES the loaded icon
+                images into the floIcon object.
+
+        formatICO($offset = 0)
+                Returns the current floIcon object formatted as an .ICO file with the
+                file offset altered by $offset.  If there are too many or too large
+                images, causing any images saved past the 4,294,967,296th byte, this
+                will return false.  (This is well outside PHP's default memory
+                allocation.)
+
+        addImage($imageResource, $desiredBitCount = 1, $pngIfWidthExceeds = 48)
+                Adds an icon image to the icon file based on the passed image resource
+                ($imageResource).  It will automatically determine the bit count, but
+                can be persuaded to increase that to $desiredBitCount if that value is
+                greater than the determined bit count.
+
+                NOTE: The image resource is saved by REFERRENCE.  So, if you edit it
+                then call getImage, the resource returned will be the same, editions and
+                all.  Destruction of the resource will cause a new resource to be
+                created in getImage().
+
+        getImage($offset)
+                Returns the php image resource either assigned by addImage or created
+                dynamically at calltime by the data loaded with readICO().  The offset
+                specified here ($offset) is the array offset starting at 0 and ending
+                at countImages().
+
+        getBestImage($height = 32, $width = 32)
+                Returns the php images resource of the highest quality image closest to
+                the size specified.  This could be useful when you only want to display
+                the icon in an icon list with a single representative icon.  A resized
+                copy of the highest quality available image will be returned if there is
+                no 32 or 24 bit icon present at the speficied dimentions.
+
+        sortImagesBySize()
+                Sorts the $this->images array by order of size, smallest to largest.
+                This is the optimal sorting for icon files.
+
+        countImages()
+                Returns a count of how many images are present in the current floIcon
+                object.
+
+floIcon public variables:
+        $images
+                Contains a numerically indexed array of floIconImage objects.
+        $updated
+                True if an image has been added since load or last formatICO, otherwise
+                false.
+
+floIconImage public functions:
+        getHeader()
+                Returns an associative array containing the information from the ICO
+                image header.
+
+        getEntry()
+                Returns an associative array containing the information from the ICO
+                entry header.
+
+                NOTE: If this icon image was created by php image resource, this may not
+                have accurate information until saving from floIcon with the formatICO()
+                function.  Specifically, offset information will be inaccurate.
+
+        getImageResource()
+                Returns a php image resource.  Same as floIcon's getImage() function.
+
+        setImageResource($imageResource, $desiredBitCount = 1, $pngIfWidthExceeds = 48)
+                Changes this icon image based on the passed image resource
+                ($imageResource). It will automatically determine the bit count, but can
+                be persuaded to increase that to $desiredBitCount if that value is
+                greater than the determined bit count.
+
+                NOTE: The image resource is saved by REFERRENCE.  So, if you edit it
+                then call getImageResource, the resource returned will be the same,
+                editions and all.  Destruction of the resource will cause a new resource
+                to be created in getImageResource().
+
+        dealocateResource()
+                This destroys the image resource variable, freeing up memory.  The image
+                will automatically be recreated when getImageResource is executed.
+*/
+class floIcon {
+        /*
+         * $images is an associative array of offset integer => floIconImage object
+         */
+        var $images; // Array of floIconImage objects.
+        var $updated = false;
+        function floIcon() {
+                $this->images = array();
+        }
+        function countImages() {
+                return count($this->images);
+        }
+        function getBestImage($height = 32, $width = 32) {
+                $best = false;
+                $bestEntry = array();
+                $secondBest = false;
+                $secondBestEntry = array();
+                foreach ($this->images as $key => $image) {
+                        $entry = $image->getEntry();
+                        $header = $image->getHeader();
+                        if (!@$entry["BitCount"]) {
+                                $entry["BitCount"] = $header["BitCount"];
+                        }
+                        if ($entry["Height"] == $height && $entry["Width"] == $width && $entry["BitCount"] == 32) {
+                                return $image->getImageResource();
+                        } elseif ($entry["Height"] == $height && $entry["Width"] == $width && $entry["BitCount"] > min(4, @$bestEntry["BitCount"])) {
+                                $best = $image;
+                                $bestEntry = $entry;
+                        } elseif (
+                                !$secondBest or
+                                $entry["Height"] >= $secondBestEntry["Height"] &&
+                                $entry["Width"] >= $secondBestEntry["Width"] &&
+                                $secondBestEntry["BitCount"] >= $secondBestEntry["BitCount"] and
+                                (
+                                        $entry["Height"] <= 64 && $entry["Height"] > $secondBestEntry["Height"] and
+                                        $entry["Height"] > 64 && $entry["Height"] < $secondBestEntry["Height"]
+                                ) ||
+                                (
+                                        $entry["Width"] <= 64 && $entry["Width"] > $secondBestEntry["Width"] and
+                                        $entry["Width"] > 64 && $entry["Width"] < $secondBestEntry["Width"]
+                                ) ||
+                                $secondBestEntry["BitCount"] > $secondBestEntry["BitCount"]
+                                ) {
+                                $secondBest = $image;
+                                $secondBestEntry = $entry;
+                        }
+                }
+                if ($best) {
+                        return $best->getImageResource();
+                } elseif ($secondBest) {
+                        if ($secondBestEntry["Width"] != $width || $secondBestEntry["Height"] != $height) {
+                                $imageResource = $secondBest->getImageResource();
+                                $newImageResource = imagecreatetruecolor($width, $height);
+                                imagesavealpha($newImageResource, true);
+                                imagealphablending($newImageResource, false);
+                                imagecopyresampled($newImageResource, $imageResource, 0, 0, 0, 0, $width, $height, $secondBestEntry["Width"], $secondBestEntry["Height"]);
+                                $this->addImage($newImageResource, 32);
+                                return $newImageResource;
+                        } else {
+                                return $secondBest->getImageResource();
+                        }
+                }
+        }
+        /*
+         * readICO merges the icon images from the file to the current list
+         */
+        function readICO($file, $offset = 0) {
+                if (file_exists($file) && filesize($file) > 0 && $filePointer = fopen($file, "r")) {
+                        fseek($filePointer, $offset);
+                        $header = unpack("SReserved/SType/SCount", fread($filePointer, 6));
+                        for ($t = 0; $t < $header["Count"]; $t++) {
+                                $newImage = new floIconImage();
+                                $newImage->readImageFromICO($filePointer, 6 + ($t * 16));
+                                $this->images[] = $newImage;
+                        }
+                        fclose($filePointer);
+                }
+        }
+        function sortImagesBySize() {
+                usort($this->images, array("floIcon", "_cmpObj"));
+        }
+        function formatICO($offset = 0) {
+                $this->updated = false;
+                $output = "";
+                $output .= pack("SSS", 0, 1, count($this->images));
+                $output_images = "";
+                foreach ($this->images as $image) {
+                        $newImageOffset = $offset + // Whatever offset we've been given.
+                                6 // Header.
+                                + (count($this->images) * 16) // Entries.
+                                + strlen($output_images);
+                        if ($newImageOffset > pow(256, 4) /* 4 bytes available for position */ ) {
+                                return false;
+                        }
+                        $output .= $image->formatEntryForIco($newImageOffset); // The images already in there.
+                        $output_images .= $image->formatImageForIco();
+                }
+                return $output.$output_images;
+        }
+        function _cmpObj($a, $b) {
+                $aSize = $a->getSize();
+                $bSize = $b->getSize();
+                if ($aSize == $bSize) {
+                        return 0;
+                }
+                return ($aSize > $bSize)?1:-1;
+        }
+
+        function addImage($imageResource, $desiredBitCount = 1, $pngIfWidthExceeds = 48) {
+                $this->updated = true;
+                $newImage = new floIconImage();
+                $newImage->setImageResource($imageResource, $desiredBitCount, $pngIfWidthExceeds);
+                $this->images[] = $newImage;
+        }
+        function getImage($offset) {
+                if (isset($this->images[$offset])) {
+                        return $this->images[$offset]->getImageResource();
+                } else {
+                        return false;
+                }
+        }
+        /*
+         * getSize computes the
+         */
+        function getSize() {
+                // Compute headers.
+                $computedSize = 6; // Always 6 bytes.
+                // Add image entry headers
+                $computedSize += count($this->images) * 16; // Entry headers are always 16 bytes.
+                foreach ($this->images as $image) {
+                        $computedSize += $image->getSize() + $image->getHeaderSize(); // getSize does not include the header.
+                }
+        }
+}
+class floIconImage {
+        var $_imageResource = null;
+        var $_entry = "";
+        var $_entryIconFormat = "";
+        var $_header = "";
+        var $_headerIconFormat = "";
+        var $_imageIconFormat = ""; // Includes palette and mask.
+        function formatEntryForIco($offset) {
+                // Format the entry, this has to be done here because we need the offset to get the full information.
+                $this->_entry["FileOffset"] = $offset;
+                $this->_entryIconFormat = pack("CCCCSSLL",
+                        $this->_entry["Width"]>=256?0:$this->_entry["Width"],
+                        $this->_entry["Height"]>=256?0:$this->_entry["Height"],
+                        $this->_entry["ColorCount"],
+                        $this->_entry["Reserved"],
+                        $this->_entry["Planes"],
+                        $this->_entry["BitCount"],
+                        $this->_entry["SizeInBytes"],
+                        $this->_entry["FileOffset"]
+                );
+                return $this->_entryIconFormat;
+        }
+        function formatImageForIco() {
+                // Format the entry, this has to be done here because we need the offset to get the full information.
+                return ($this->_headerIconFormat.$this->_imageIconFormat);
+        }
+
+        // Will move $bitCount UP to $desiredBitCount if $bitCount is found to be less than it.
+        function setImageResource($imageResource, $desiredBitCount = 1, $pngIfWidthExceeds = 48) {
+                imagesavealpha($imageResource, true);
+                imagealphablending($imageResource, false);
+                $height = imagesy($imageResource);
+                $width = imagesx($imageResource);
+               
+                // Parse resource to determine header and icon format
+
+                // Find Palette information
+                $is_32bit = false; // Start with an assumption and get proven wrong.
+                $hasTransparency = 0;
+                $blackColor = false;
+                $bitCount = 0;
+                $realPalette = array();
+                $realIndexPalette = array();
+                for ($x = 0; $x < $width && !$is_32bit; $x++) {
+                        for ($y = 0; $y < $height && !$is_32bit; $y++) {
+                                $colorIndex = imagecolorat($imageResource, $x, $y);
+                                $color = imagecolorsforindex($imageResource, $colorIndex);
+                                if ($color["alpha"] == 0) {
+                                        // No point continuing if there's more than 256 colors or it's 32bit.
+                                        if (count($realPalette) < 257 && !$is_32bit) {
+                                                $inRealPalette = false;
+                                                foreach($realPalette as $realPaletteKey => $realPaletteColor) {
+                                                        if (
+                                                                $color["red"] == $realPaletteColor["red"] and
+                                                                $color["green"] == $realPaletteColor["green"] and
+                                                                $color["blue"] == $realPaletteColor["blue"]
+                                                        ) {
+                                                                $inRealPalette = $realPaletteKey;
+                                                                break;
+                                                        }
+                                                }
+                                                if ($inRealPalette === false) {
+                                                        $realIndexPalette[$colorIndex] = count($realPalette);
+                                                        if (
+                                                                $blackColor === false and
+                                                                $color["red"] == 0 and
+                                                                $color["green"] == 0 and
+                                                                $color["blue"] == 0
+                                                        ) {
+                                                                $blackColor = count($realPalette);
+                                                        }
+                                                        $realPalette[] = $color;
+                                                } else {
+                                                        $realIndexPalette[$colorIndex] = $inRealPalette;
+                                                }
+                                        }
+                                } else {
+                                        $hasTransparency = 1;
+                                }
+                                if ($color["alpha"] != 0 && $color["alpha"] != 127) {
+                                        $is_32bit = true;
+                                }
+                        }
+                }
+                if ($is_32bit) {
+                        $colorCount = 0;
+                        $bitCount = 32;
+                } else {
+                        if ($hasTransparency && $blackColor === false) {
+                                // We need a black color to facilitate transparency.  Unfortunately, this can
+                                // increase the palette size by 1 if there's no other black color.
+                                $blackColor = count($realPalette);
+                                $color = array(
+                                        "red" => 0,
+                                        "blue" => 0,
+                                        "green" => 0,
+                                        "alpha" => 0
+                                );
+                                $realPalette[] = $color;
+                        }
+                        $colorCount = count($realPalette);
+                        if ($colorCount > 256 || $colorCount == 0) {
+                                $bitCount = 24;
+                        } elseif ($colorCount > 16) {
+                                $bitCount = 8;
+                                // 8 bit
+                        } elseif ($colorCount > 2) {
+                                $bitCount = 4;
+                                // 4 bit
+                        } else {
+                                $bitCount = 1;
+                                // 1 bit
+                        }
+                        if ($desiredBitCount > $bitCount) {
+                                $bitCount = $desiredBitCount;
+                        }
+                        switch ($bitCount) {
+                                case 24:
+                                        $colorCount = 0;
+                                        break;
+                                case 8:
+                                        $colorCount = 256;
+                                        break;
+                                case 4:
+                                        $colorCount = 16;
+                                        break;
+                                case 1:
+                                        $colorCount = 2;
+                                        break;
+                        }
+                }
+                // Create $this->_imageIconFormat...
+                $this->_imageIconFormat = "";
+                if ($bitCount < 24) {
+                        $iconPalette = array();
+                        // Save Palette
+                        foreach ($realIndexPalette as $colorIndex => $paletteIndex) {
+                                $color = $realPalette[$paletteIndex];
+                                $this->_imageIconFormat .= pack("CCCC", $color["blue"], $color["green"], $color["red"], 0);
+                        }
+                        while (strlen($this->_imageIconFormat) < $colorCount * 4) {
+                                $this->_imageIconFormat .= pack("CCCC", 0, 0, 0, 0);
+                        }
+                        // Save Each Pixel as Palette Entry
+                        $byte = 0; // For $bitCount < 8 math
+                        $bitPosition = 0; // For $bitCount < 8 math
+                        for ($y = 0; $y < $height; $y++) {
+                                for ($x = 0; $x < $width; $x++) {
+                                        $color = imagecolorat($imageResource, $x, $height-$y-1);
+                                        if (isset($realIndexPalette[$color])) {
+                                                $color = $realIndexPalette[$color];
+                                        } else {
+                                                $color = $blackColor;
+                                        }
+
+                                        if ($bitCount < 8) {
+                                                $bitPosition += $bitCount;
+                                                $colorAdjusted = $color * pow(2, 8 - $bitPosition);
+                                                $byte += $colorAdjusted;
+                                                if ($bitPosition == 8) {
+                                                        $this->_imageIconFormat .= chr($byte);
+                                                        $bitPosition = 0;
+                                                        $byte = 0;
+                                                }
+                                        } else {
+                                                $this->_imageIconFormat .= chr($color);
+                                        }
+                                }
+                                // Each row ends with dumping the remaining bits and filling up to the 32bit line with 0's.
+                                if ($bitPosition) {
+                                        $this->_imageIconFormat .= chr($byte);
+                                        $bitPosition = 0;
+                                        $byte = 0;
+                                }
+                                if (strlen($this->_imageIconFormat)%4) $this->_imageIconFormat .= str_repeat(chr(0), 4-(strlen($this->_imageIconFormat)%4));
+                        }
+                } else {
+                        // Save each pixel.
+                        for ($y = 0; $y < $height; $y++) {
+                                for ($x = 0; $x < $width; $x++) {
+                                        $color = imagecolorat($imageResource, $x, $height-$y-1);
+                                        $color = imagecolorsforindex($imageResource, $color);
+                                        if ($bitCount == 24) {
+                                                if ($color["alpha"]) {
+                                                        $this->_imageIconFormat .= pack("CCC", 0, 0, 0);
+                                                } else {
+                                                        $this->_imageIconFormat .= pack("CCC", $color["blue"], $color["green"], $color["red"]);
+                                                }
+                                        } else {
+                                                $color["alpha"] = round((127-$color["alpha"]) / 127 * 255);
+                                                $this->_imageIconFormat .= pack("CCCC", $color["blue"], $color["green"], $color["red"], $color["alpha"]);
+                                        }
+                                }
+                                if (strlen($this->_imageIconFormat)%4) $this->_imageIconFormat .= str_repeat(chr(0), 4-(strlen($this->_imageIconFormat)%4));
+                        }
+                }
+                // save AND map (transparency)
+                $byte = 0; // For $bitCount < 8 math
+                $bitPosition = 0; // For $bitCount < 8 math
+                for ($y = 0; $y < $height; $y++) {
+                        for ($x = 0; $x < $width; $x++) {
+                                if ($bitCount < 32) {
+                                        $color = imagecolorat($imageResource, $x, $height-$y-1);
+                                        $color = imagecolorsforindex($imageResource, $color);
+                                        $color = $color["alpha"] == 127?1:0;
+                                } else {
+                                        $color = 0;
+                                }
+
+                                $bitPosition += 1;
+                                $colorAdjusted = $color * pow(2, 8 - $bitPosition);
+                                $byte += $colorAdjusted;
+                                if ($bitPosition == 8) {
+                                        $this->_imageIconFormat .= chr($byte);
+                                        $bitPosition = 0;
+                                        $byte = 0;
+                                }
+                        }
+                        // Each row ends with dumping the remaining bits and filling up to the 32bit line with 0's.
+                        if ($bitPosition) {
+                                $this->_imageIconFormat .= chr($byte);
+                                $bitPosition = 0; // For $bitCount < 8 math
+                                $byte = 0;
+                        }
+                        while (strlen($this->_imageIconFormat)%4) {
+                                $this->_imageIconFormat .= chr(0);
+                        }
+                }
+                if ($colorCount >= 256) {
+                        $colorCount = 0;
+                }
+                // Create header information...
+                $this->_header = array(
+                        "Size" => 40,
+                        "Width" => $width,
+                        "Height" => $height*2,
+                        "Planes" => 1,
+                        "BitCount" => $bitCount,
+                        "Compression" => 0,
+                        "ImageSize" => strlen($this->_imageIconFormat),
+                        "XpixelsPerM" => 0,
+                        "YpixelsPerM" => 0,
+                        "ColorsUsed" => $colorCount,
+                        "ColorsImportant" => 0,
+                );
+                $this->_headerIconFormat = pack("LLLSSLLLLLL",
+                        $this->_header["Size"],
+                        $this->_header["Width"],
+                        $this->_header["Height"],
+
+                        $this->_header["Planes"],
+                        $this->_header["BitCount"],
+
+                        $this->_header["Compression"],
+                        $this->_header["ImageSize"],
+                        $this->_header["XpixelsPerM"],
+                        $this->_header["YpixelsPerM"],
+                        $this->_header["ColorsUsed"],
+                        $this->_header["ColorsImportant"]
+                );
+                $this->_entry = array(
+                        "Width" => $width,
+                        "Height" => $height,
+                        "ColorCount" => $colorCount,
+                        "Reserved" => 0,
+                        "Planes" => 1,
+                        "BitCount" => $bitCount,
+                        "SizeInBytes" => $this->_header["Size"] + $this->_header["ImageSize"],
+                        "FileOffset" => -1,
+                );
+                $this->_entryIconFormat = ""; // This won't get set until it's needed with the offset.
+                $this->_imageResource = $imageResource;
+
+                // Make png if width exceeds limit for old ico style
+                if ($width > $pngIfWidthExceeds) {
+                        // I wish there were a better way to get the info than this.  If anyone needs a version that doesn't use OB, I can have one that creates a TMP file.
+                        ob_start();
+                        imagepng($imageResource);
+                        $imageAsPng = ob_get_contents();
+                        ob_end_clean();
+                        $this->_headerIconFormat = "";
+                        $this->_imageIconFormat = $imageAsPng;
+                }
+
+       
+        }
+        function _createImageResource() {
+                if ($newImage = @imagecreatefromstring($this->_headerIconFormat.$this->_imageIconFormat)) {
+                        // Vista supports PNG.
+                        $this->_headerIconFormat = "";
+                        $this->_imageIconFormat = $this->_headerIconFormat.$this->_imageIconFormat;
+                        imagesavealpha($newImage, true);
+                        imagealphablending($newImage, false);
+                        $this->_imageResource = $newImage;
+                } elseif ($this->_entry["Height"] <= 1024 && $this->_entry["Width"] <= 1024) {
+                        $newImage = imagecreatetruecolor($this->_entry["Width"], $this->_entry["Height"]);
+                        imagesavealpha($newImage, true);
+                        imagealphablending($newImage, false);
+                        $readPosition = 0;
+                        $palette = array();
+                        if ($this->_header["BitCount"] < 24) {
+                                // Read Palette for low bitcounts
+                                $colorsInPalette = $this->_header["ColorsUsed"]?$this->_header["ColorsUsed"]:$this->_entry["ColorCount"];
+                                for ($t = 0; $t < pow(2, $this->_header["BitCount"]); $t++) {
+                                        $blue = ord($this->_imageIconFormat[$readPosition++]);
+                                        $green = ord($this->_imageIconFormat[$readPosition++]);
+                                        $red = ord($this->_imageIconFormat[$readPosition++]);
+                                        $readPosition++; // Unused "Reserved" value.
+                                                $existingPaletteEntry = imagecolorexactalpha($newImage, $red, $green, $blue, 0);
+                                                if ($existingPaletteEntry >= 0) {
+                                                        $palette[] = $existingPaletteEntry;
+                                                } else {
+                                                        $palette[] = imagecolorallocatealpha($newImage, $red, $green, $blue, 0);
+                                                }
+                                }
+                                // XOR
+                                for ($y = 0; $y < $this->_entry["Height"]; $y++) {
+                                        $colors = array();
+                                        for ($x = 0; $x < $this->_entry["Width"]; $x++) {
+                                                if ($this->_header["BitCount"] < 8) {
+                                                        $color = array_shift($colors);
+                                                        if (is_null($color)) {
+                                                                $byte = ord($this->_imageIconFormat[$readPosition++]);
+                                                                $tmp_color = 0;
+                                                                for ($t = 7; $t >= 0; $t--) {
+                                                                        $bit_value = pow(2, $t);
+                                                                        $bit = floor($byte / $bit_value);
+                                                                        $byte = $byte - ($bit * $bit_value);
+                                                                        $tmp_color += $bit * pow(2, $t%$this->_header["BitCount"]);
+                                                                        if ($t%$this->_header["BitCount"] == 0) {
+                                                                                array_push($colors, $tmp_color);
+                                                                                $tmp_color = 0;
+                                                                        }
+                                                                }
+                                                                $color = array_shift($colors);
+                                                        }
+                                                } else {
+                                                        $color = ord($this->_imageIconFormat[$readPosition++]);
+                                                }
+                                                imagesetpixel($newImage, $x, $this->_entry["Height"]-$y-1, $palette[$color]) or die("can't set pixel");
+                                        }
+                                        // All rows end on the 32 bit
+                                        if ($readPosition%4) $readPosition += 4-($readPosition%4);
+                                }
+                        } else {
+                                // BitCount >= 24, No Palette.
+                                // marking position because some icons mark all pixels transparent when using an AND map.
+                                $markPosition = $readPosition;
+                                $retry = true;
+                                $ignoreAlpha = false;
+                                while ($retry) {
+                                        $alphas = array();
+                                        $retry = false;
+                                        for ($y = 0; $y < $this->_entry["Height"] and !$retry; $y++) {
+                                                for ($x = 0; $x < $this->_entry["Width"] and !$retry; $x++) {
+                                                        $blue = ord($this->_imageIconFormat[$readPosition++]);
+                                                        $green = ord($this->_imageIconFormat[$readPosition++]);
+                                                        $red = ord($this->_imageIconFormat[$readPosition++]);
+                                                        if ($this->_header["BitCount"] < 32) {
+                                                                $alpha = 0;
+                                                        } elseif($ignoreAlpha) {
+                                                                $alpha = 0;
+                                                                $readPosition++;
+                                                        } else {
+                                                                $alpha = ord($this->_imageIconFormat[$readPosition++]);
+                                                                $alphas[$alpha] = $alpha;
+                                                                $alpha = 127-round($alpha/255*127);
+                                                        }
+                                                        $paletteEntry = imagecolorexactalpha($newImage, $red, $green, $blue, $alpha);
+                                                        if ($paletteEntry < 0) {
+                                                                $paletteEntry = imagecolorallocatealpha($newImage, $red, $green, $blue, $alpha);
+                                                        }
+                                                        imagesetpixel($newImage, $x, $this->_entry["Height"]-$y-1, $paletteEntry) or die("can't set pixel");
+                                                }
+                                                if ($readPosition%4) $readPosition += 4-($readPosition%4);
+                                        }
+                                        if ($this->_header["BitCount"] == 32 && isset($alphas[0]) && count($alphas) == 1) {
+                                                $retry = true;
+                                                $readPosition = $markPosition;
+                                                $ignoreAlpha = true;
+                                        }
+                                }
+
+                        }
+                        // AND map
+                        if ($this->_header["BitCount"] < 32 || $ignoreAlpha) {
+                                // Bitcount == 32, No AND (if using alpha).
+                                $palette[-1] = imagecolorallocatealpha($newImage, 0, 0, 0, 127);
+                                imagecolortransparent($newImage, $palette[-1]);
+                                for ($y = 0; $y < $this->_entry["Height"]; $y++) {
+                                        $colors = array();
+                                        for ($x = 0; $x < $this->_entry["Width"]; $x++) {
+                                                $color = array_shift($colors);
+                                                if (is_null($color)) {
+                                                        $byte = ord($this->_imageIconFormat[$readPosition++]);
+                                                        $tmp_color = 0;
+                                                        for ($t = 7; $t >= 0; $t--) {
+                                                                $bit_value = pow(2, $t);
+                                                                $bit = floor($byte / $bit_value);
+                                                                $byte = $byte - ($bit * $bit_value);
+                                                                array_push($colors, $bit);
+                                                        }
+                                                        $color = array_shift($colors);
+                                                }
+                                                if ($color) {
+                                                        imagesetpixel($newImage, $x, $this->_entry["Height"]-$y-1, $palette[-1]) or die("can't set pixel");
+                                                }
+                                        }
+                                        // All rows end on the 32 bit.
+                                        if ($readPosition%4) $readPosition += 4-($readPosition%4);
+                                }
+                        }
+                        if ($this->_header["BitCount"] < 24) {
+                                imagetruecolortopalette($newImage, true, pow(2, $this->_header["BitCount"]));
+                        }
+                }
+                $this->_imageResource = $newImage;
+        }
+        // this function expects that $_entry, $_header and $_imageIconFormat have already been read, specifically from readImageFromICO.
+        // Don't call this function except from there.
+        function readImageFromICO($filePointer, $entryOffset) {
+                $tmpPosition = ftell($filePointer); // So any other applications won't loose their position.
+                // Get the entry.
+                fseek($filePointer, $entryOffset);
+                $this->_entryIconFormat = fread($filePointer, 16);
+                $this->_entry = unpack("CWidth/CHeight/CColorCount/CReserved/SPlanes/SBitCount/LSizeInBytes/LFileOffset", $this->_entryIconFormat);
+
+                // Position the file pointer.
+                fseek($filePointer, $this->_entry["FileOffset"]);
+
+                // Get the header.
+                $this->_headerIconFormat = fread($filePointer, 40);
+        $this->_header = unpack("LSize/LWidth/LHeight/SPlanes/SBitCount/LCompression/LImageSize/LXpixelsPerM/LYpixelsPerM/LColorsUsed/LColorsImportant", $this->_headerIconFormat);
+
+                // Get the image.
+                $this->_imageIconFormat = @fread($filePointer, $this->_entry["SizeInBytes"] - strlen($this->_headerIconFormat));
+                fseek($filePointer, $tmpPosition); // So any other applications won't loose their position.
+
+                if ($newImage = @imagecreatefromstring($this->_headerIconFormat.$this->_imageIconFormat)) {
+                        // This is a PNG, the supposed header information is useless.
+                        $this->_header = array (
+                                "Size" => 0,
+                                "Width" => imagesx($newImage),
+                                "Height" => imagesy($newImage) * 2,
+                                "Planes" => 0,
+                                "BitCount" => 32,
+                                "Compression" => 0,
+                                "ImageSize" => strlen($this->_imageIconFormat),
+                                "XpixelsPerM" => 0,
+                                "YpixelsPerM" => 0,
+                                "ColorsUsed" => 0,
+                                "ColorsImportant" => 0,
+                        );
+                        imagedestroy($newImage);
+                }
+
+                // Support for larger images requires entry marked as 0.
+                if ($this->_entry["Width"] == 0) {
+                        $this->_entry["Width"] = $this->_header["Width"];
+                }
+                if ($this->_entry["Height"] == 0) {
+                        $this->_entry["Height"] = $this->_header["Height"]/2;
+                }
+        }
+        function getHeader() {
+                return $this->_header;
+        }
+        function getEntry() {
+                return $this->_entry;
+        }
+        function floIconImage() {
+        }
+        function getHeaderSize() {
+                return strlen($this->_headerIconFormat);
+        }
+        function getSize() {
+                return strlen($this->_imageIconFormat);
+        }
+        function getImageResource() {
+                if (!$this->_imageResource) $this->_createImageResource();
+                return $this->_imageResource;
+        }
+        function dealocateResource() {
+                @imagedestroy($this->_imageResource);
+                $this->_imageResource = null;
+        }
+}
+?>
\ No newline at end of file
diff --git a/schema/versions/mysql/117.sql b/schema/versions/mysql/117.sql
new file mode 100644
index 000000000..008f819ed
--- /dev/null
+++ b/schema/versions/mysql/117.sql
@@ -0,0 +1,7 @@
+begin;
+
+ALTER TABLE `ttrss_feeds` ADD favicon_avg_color VARCHAR(11)
+
+update ttrss_version set schema_version = 117;
+
+commit;
-- 
cgit v1.2.3-54-g00ecf


From 14118af36f2ba65a4e5151ee33b6ad565492cbf0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 14:54:17 +0400
Subject: fix schema for favicon_avg_color

---
 include/functions.php         | 10 +++++-----
 schema/ttrss_schema_mysql.sql |  3 ++-
 schema/ttrss_schema_pgsql.sql |  3 ++-
 schema/versions/mysql/117.sql |  3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 1ae5bbbe2..46882c387 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 116);
+	define('SCHEMA_VERSION', 117);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -511,13 +511,13 @@
             return $icon_file;
 		}
 	}
-	
+
 	function calculate_avg_color($iconFile) {
-		
+
 		require_once "lib/floIcon.php";
-		
+
 		$imgInfo = @getimagesize($iconFile);
-        
+
 		if(strtolower($imgInfo['mime'])=='image/vnd.microsoft.icon') {
 			$ico = new floIcon();
 			@$ico->readICO($iconFile);
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 9ed63f42a..3773d9a45 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -108,6 +108,7 @@ create table ttrss_feeds (id integer not null auto_increment primary key,
 	purge_interval integer not null default 0,
 	last_updated datetime default 0,
 	last_error varchar(250) not null default '',
+	favicon_avg_color varchar(11) default null,
 	site_url varchar(250) not null default '',
 	auth_login varchar(250) not null default '',
 	auth_pass varchar(250) not null default '',
@@ -298,7 +299,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (116);
+insert into ttrss_version values (117);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index ec3b778cc..3fc58555d 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -70,6 +70,7 @@ create table ttrss_feeds (id serial not null primary key,
 	purge_interval integer not null default 0,
 	last_updated timestamp default null,
 	last_error text not null default '',
+	favicon_avg_color varchar(11) default null,
 	site_url varchar(250) not null default '',
 	auth_login varchar(250) not null default '',
 	parent_feed integer default null references ttrss_feeds(id) on delete set null,
@@ -256,7 +257,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (116);
+insert into ttrss_version values (117);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
diff --git a/schema/versions/mysql/117.sql b/schema/versions/mysql/117.sql
index 008f819ed..da3d056cc 100644
--- a/schema/versions/mysql/117.sql
+++ b/schema/versions/mysql/117.sql
@@ -1,6 +1,7 @@
 begin;
 
-ALTER TABLE `ttrss_feeds` ADD favicon_avg_color VARCHAR(11)
+ALTER TABLE ttrss_feeds ADD COLUMN favicon_avg_color VARCHAR(11);
+alter table ttrss_feeds alter column favicon_avg_color set default null;
 
 update ttrss_version set schema_version = 117;
 
-- 
cgit v1.2.3-54-g00ecf


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 ++--
 include/functions.php |  3 +++
 include/rssfuncs.php  | 10 +++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'include/functions.php')

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\"
diff --git a/include/functions.php b/include/functions.php
index 46882c387..6372db1fd 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2602,6 +2602,9 @@
 						LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
 				}
 
+				if ($vfeed_query_part)
+					$vfeed_query_part .= "favicon_avg_color,";
+
 				$query = "SELECT DISTINCT
 						date_entered,
 						guid,
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index bcc88dc2a..2e522175e 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -416,9 +416,13 @@
 
 						 require_once "colors.php";
 
-                   if (is_array($favicon_color))
-							  $favicon_colorstring = ",favicon_avg_color = '" .
-							  		_color_pack(array_slice($favicon_color, 0, 3)) . "'";
+						 if (is_array($favicon_color))
+								$tmp = array($favicon_color['red'],
+									$favicon_color['green'],
+									$favicon_color['blue']);
+
+								 $favicon_colorstring = ",favicon_avg_color = '" .
+								_color_pack($tmp) . "'";
                 }
 
 				db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring
-- 
cgit v1.2.3-54-g00ecf


From 6ac722d5b1e336dcb8eebec04496150c2f116154 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 17:01:51 +0400
Subject: try to improve color guessing algorithm a bit

---
 include/colors.php    | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
 include/functions.php | 41 -----------------------------------
 include/rssfuncs.php  | 13 ++++-------
 3 files changed, 64 insertions(+), 50 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/colors.php b/include/colors.php
index d1e970728..19c891517 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once "lib/floIcon.php";
+
 function _resolve_htmlcolor($color) {
 	$htmlcolors = array ("aliceblue" => "#f0f8ff",
 		"antiquewhite" => "#faebd7",
@@ -278,4 +280,62 @@ function hsl2rgb($arr) {
     return array($r, $g, $B);
 }
 
+	function colorPalette($imageFile, $numColors, $granularity = 5) {
+	   $granularity = max(1, abs((int)$granularity));
+	   $colors = array();
+
+		$size = @getimagesize($imageFile);
+
+		if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
+			$ico = new floIcon();
+			@$ico->readICO($imageFile);
+
+			if(count($ico->images)==0)
+				return null;
+			else
+				$img = @$ico->images[count($ico->images)-1]->getImageResource();
+
+		} else {
+		   $img = @imagecreatefromstring(file_get_contents($imageFile));
+		}
+
+		if (!$img) return false;
+
+	   for($x = 0; $x < $size[0]; $x += $granularity) {
+	      for($y = 0; $y < $size[1]; $y += $granularity) {
+	         $thisColor = imagecolorat($img, $x, $y);
+	         $rgb = imagecolorsforindex($img, $thisColor);
+	         $red = round(round(($rgb['red'] / 0x33)) * 0x33);
+	         $green = round(round(($rgb['green'] / 0x33)) * 0x33);
+	         $blue = round(round(($rgb['blue'] / 0x33)) * 0x33);
+	         $thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue);
+	         if(array_key_exists($thisRGB, $colors)) {
+	            $colors[$thisRGB]++;
+	         } else{
+	            $colors[$thisRGB] = 1;
+	         }
+	      }
+		}
+
+	   arsort($colors);
+	   return array_slice(array_keys($colors), 0, $numColors);
+	}
+
+	function calculate_avg_color($iconFile) {
+		$palette = colorPalette($iconFile, 4, 4);
+
+		if (is_array($palette)) {
+			foreach ($palette as $p) {
+				$hsl = rgb2hsl(_color_unpack("#$p"));
+
+				if ($hsl[1] > 0.25 && $hsl[2] > 0.25 &&
+					!($hsl[0] >= 0 && $hsl[0] < 0.01 && $hsl[1] < 0.01) &&
+					!($hsl[0] >= 0 && $hsl[0] < 0.01 && $hsl[2] > 0.99)) {
+
+					return _color_pack(hsl2rgb($hsl));
+				}
+			}
+		}
+		return false;
+	}
 ?>
diff --git a/include/functions.php b/include/functions.php
index 6372db1fd..306014d96 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -512,47 +512,6 @@
 		}
 	}
 
-	function calculate_avg_color($iconFile) {
-
-		require_once "lib/floIcon.php";
-
-		$imgInfo = @getimagesize($iconFile);
-
-		if(strtolower($imgInfo['mime'])=='image/vnd.microsoft.icon') {
-			$ico = new floIcon();
-			@$ico->readICO($iconFile);
-			//TODO: error logging
-			if(count($ico->images)==0)
-				return null;
-			else {
-				$image = @$ico->images[count($ico->images)-1]->getImageResource();
-			}
-			$type = "ico";
-			}
-		elseif(strtolower($imgInfo['mime'])=='image/png') {
-            $image = imagecreatefrompng($iconFile);
-			$type = 'png';
-		}
-		elseif(strtolower($imgInfo['mime'])=='image/jpeg') {
-			$image = imagecreatefromjpeg($iconFile);
-			$type = 'jpg';
-		}
-		elseif(strtolower($imgInfo['mime'])=='image/gif') {
-			$image = imagecreatefromgif($iconFile);
-			$type = 'gif';
-		}
-		//TODO: error logging
-		if (is_null($image))
-			return null;
-		$width = imagesx($image);
-		$height = imagesy($image);
-		$pixel = imagecreatetruecolor(1, 1);
-		imagecopyresampled($pixel, $image, 0, 0, 0, 0, 1, 1, $width, $height);
-		$rgb = imagecolorat($pixel, 0, 0);
-		$color = imagecolorsforindex($pixel, $rgb);
-		return $color;
-	}
-
 	function print_select($id, $default, $values, $attributes = "") {
 		print "<select name=\"$id\" id=\"$id\" $attributes>";
 		foreach ($values as $v) {
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 2e522175e..0d55dce36 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -412,18 +412,13 @@
 				$favicon_file = ICONS_DIR . "/$feed.ico";
 
 				if (file_exists($favicon_file)) {
-					    $favicon_color = calculate_avg_color($favicon_file);
-
 						 require_once "colors.php";
 
-						 if (is_array($favicon_color))
-								$tmp = array($favicon_color['red'],
-									$favicon_color['green'],
-									$favicon_color['blue']);
+						 $favicon_color = db_escape_string($link,
+							 calculate_avg_color($favicon_file));
 
-								 $favicon_colorstring = ",favicon_avg_color = '" .
-								_color_pack($tmp) . "'";
-                }
+						 $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
+				}
 
 				db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring
 					WHERE id = '$feed'");
-- 
cgit v1.2.3-54-g00ecf


From 76e087b0173743657a2066dd2fd3446b6a34d558 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 01:02:42 +0400
Subject: format_article_labels: bail out if passed something other than array

---
 include/functions.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 306014d96..018520648 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3450,6 +3450,8 @@
 
 	function format_article_labels($labels, $id) {
 
+		if (is_array($labels)) return '';
+
 		$labels_str = "";
 
 		foreach ($labels as $l) {
-- 
cgit v1.2.3-54-g00ecf


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 +
 include/functions.php | 11 ++---------
 js/tt-rss.js          |  6 +++++-
 js/viewfeed.js        | 28 ----------------------------
 4 files changed, 8 insertions(+), 38 deletions(-)

(limited to 'include/functions.php')

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();
 
diff --git a/include/functions.php b/include/functions.php
index 018520648..87eb3d6a9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2990,19 +2990,12 @@
 		if (strpos($ctype, "audio/") === 0) {
 
 			if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
-				strpos($_SERVER['HTTP_USER_AGENT'], "Chrome") !== false ||
-				strpos($_SERVER['HTTP_USER_AGENT'], "Safari") !== false )) {
+				$_SESSION["hasMp3"])) {
 
-				$id = 'AUDIO-' . uniqid();
-
-				$entry .= "<audio id=\"$id\"\" controls style='display : none'>
+				$entry .= "<audio controls>
 					<source type=\"$ctype\" src=\"$url\"></source>
 					</audio>";
 
-				$entry .= "<span onclick=\"player(this)\"
-					title=\"".__("Click to play")."\" status=\"0\"
-					class=\"player\" audio-id=\"$id\">".__("Play")."</span>";
-
 			} else {
 
 				$entry .= "<object type=\"application/x-shockwave-flash\"
diff --git a/js/tt-rss.js b/js/tt-rss.js
index a572e5324..fe12297d4 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -248,11 +248,15 @@ function init() {
 
 		loading_set_progress(20);
 
-		var hasAudio = !!((myAudioTag = document.createElement('audio')).canPlayType);
+		var a = document.createElement('audio');
+
+		var hasAudio = !!a.canPlayType;
 		var hasSandbox = "sandbox" in document.createElement("iframe");
+		var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
 
 		new Ajax.Request("backend.php",	{
 			parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
+				hasMp3: hasMp3,
 				hasSandbox: hasSandbox},
 			onComplete: function(transport) {
 					backend_sanity_check_callback(transport);
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 519ab3449..ddee1e461 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -2027,34 +2027,6 @@ function initHeadlinesMenu() {
 	}
 }
 
-
-function player(elem) {
-	var aid = elem.getAttribute("audio-id");
-	var status = elem.getAttribute("status");
-
-	var audio = $(aid);
-
-	if (audio) {
-		if (status == 0) {
-			audio.play();
-			status = 1;
-			elem.innerHTML = __("Playing...");
-			elem.title = __("Click to pause");
-			elem.addClassName("playing");
-		} else {
-			audio.pause();
-			status = 0;
-			elem.innerHTML = __("Play");
-			elem.title = __("Click to play");
-			elem.removeClassName("playing");
-		}
-
-		elem.setAttribute("status", status);
-	} else {
-		alert("Your browser doesn't seem to support HTML5 audio.");
-	}
-}
-
 function cache_set(id, obj) {
 	//console.log("cache_set: " + id);
 	if (has_storage)
-- 
cgit v1.2.3-54-g00ecf


From 52803a0bfd315e375221c446f597f64ecbfb2aae Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 16:41:32 +0400
Subject: add SPHINX_SERVER

---
 config.php-dist           | 3 +++
 include/functions.php     | 4 +++-
 include/sanity_config.php | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'include/functions.php')

diff --git a/config.php-dist b/config.php-dist
index 5366120af..9dd46e295 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -108,6 +108,9 @@
 	// Enable fulltext search using Sphinx (http://www.sphinxsearch.com)
 	// Please see http://tt-rss.org/wiki/SphinxSearch for more information.
 
+	define('SPHINX_SERVER', 'localhost:9312');
+	// Hostname:port combination for the Sphinx server.
+
 	define('SPHINX_INDEX', 'ttrss');
 	// Index name in Sphinx configuration. You can specify multiple indexes
 	// as a comma-separated string.
diff --git a/include/functions.php b/include/functions.php
index 87eb3d6a9..659950be0 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3824,7 +3824,9 @@
 
 		$sphinxClient = new SphinxClient();
 
-		$sphinxClient->SetServer('localhost', 9312);
+		$sphinxpair = explode(":", SPHINX_SERVER, 2);
+
+		$sphinxClient->SetServer($sphinxpair[0], $sphinxpair[1]);
 		$sphinxClient->SetConnectTimeout(1);
 
 		$sphinxClient->SetFieldWeights(array('title' => 70, 'content' => 30,
diff --git a/include/sanity_config.php b/include/sanity_config.php
index 255b404d6..398c979fe 100644
--- a/include/sanity_config.php
+++ b/include/sanity_config.php
@@ -1,3 +1,3 @@
-<?php # This file has been generated at:  Tue Apr 16 16:38:38 MSK 2013
+<?php # This file has been generated at:  Tue Apr 16 16:41:13 MSK 2013
 define('GENERATED_CONFIG_CHECK', 26);
-$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>
+$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>
-- 
cgit v1.2.3-54-g00ecf


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 ++++++++++++++++++++++++++++++
 include/errorhandler.php      | 50 +++++++++++++++++++++++++++++++++++++++++++
 include/functions.php         | 15 ++++++++++---
 include/sessions.php          |  1 +
 schema/ttrss_schema_mysql.sql | 13 ++++++++++-
 schema/ttrss_schema_pgsql.sql | 13 ++++++++++-
 schema/versions/mysql/118.sql | 16 ++++++++++++++
 schema/versions/pgsql/118.sql | 15 +++++++++++++
 9 files changed, 177 insertions(+), 5 deletions(-)
 create mode 100644 classes/logger.php
 create mode 100644 classes/logger/sql.php
 create mode 100644 include/errorhandler.php
 create mode 100644 schema/versions/mysql/118.sql
 create mode 100644 schema/versions/pgsql/118.sql

(limited to 'include/functions.php')

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;
+	}
+
+}
+?>
diff --git a/include/errorhandler.php b/include/errorhandler.php
new file mode 100644
index 000000000..13eed0e30
--- /dev/null
+++ b/include/errorhandler.php
@@ -0,0 +1,50 @@
+<?php
+// TODO: make configurable
+require_once "classes/logger.php";
+require_once "classes/logger/sql.php";
+
+function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
+	global $logger;
+
+	if (!$logger) $logger = new Logger_SQL();
+
+	$errfile = str_replace(dirname(dirname(__FILE__)), "", $errfile);
+
+	if ($logger) {
+		return $logger->log_error($errno, $errstr, $file, $line, $context);
+	}
+
+	return false;
+}
+
+function ttrss_fatal_handler() {
+	global $logger;
+
+	$file		= "UNKNOWN FILE";
+	$errstr  = "UNKNOWN";
+	$errno   = E_CORE_ERROR;
+	$line		= -1;
+
+	$error = error_get_last();
+
+	if ($error !== NULL) {
+		$errno   = $error["type"];
+		$file = $error["file"];
+		$line = $error["line"];
+		$errstr  = $error["message"];
+
+		$context = debug_backtrace();
+
+		$file = str_replace(dirname(dirname(__FILE__)) . "/", "", $file);
+
+		if (!$logger) $logger = new Logger_SQL();
+
+		if ($logger) {
+			$logger->log_error($errno, $errstr, $file, $line, $context);
+		}
+	}
+}
+
+register_shutdown_function('ttrss_fatal_handler');
+set_error_handler('ttrss_error_handler');
+?>
diff --git a/include/functions.php b/include/functions.php
index 659950be0..621357ea6 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 117);
+	define('SCHEMA_VERSION', 118);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -3369,9 +3369,8 @@
 		return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
 	}
 
-	function init_connection($link) {
+	function init_connection_only($link) {
 		if ($link) {
-
 			if (DB_TYPE == "pgsql") {
 				pg_query($link, "set client_encoding = 'UTF-8'");
 				pg_set_client_encoding("UNICODE");
@@ -3385,6 +3384,16 @@
 				}
 			}
 
+			return true;
+		}
+
+		return false;
+	}
+
+	function init_connection($link) {
+		if ($link) {
+			init_connection_only($link);
+
 			global $pluginhost;
 
 			$pluginhost = new PluginHost($link);
diff --git a/include/sessions.php b/include/sessions.php
index 402e8b8de..bc8b7cff1 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -3,6 +3,7 @@
 
 	require_once "config.php";
 	require_once "db.php";
+	require_once "errorhandler.php";
 	require_once "lib/accept-to-gettext.php";
 	require_once "lib/gettext/gettext.inc";
 	require_once "version.php";
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 3773d9a45..0d0a8f460 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -1,6 +1,7 @@
 SET NAMES utf8;
 SET CHARACTER SET utf8;
 
+drop table if exists ttrss_error_log;
 drop table if exists ttrss_plugin_storage;
 drop table if exists ttrss_linked_feeds;
 drop table if exists ttrss_linked_instances;
@@ -299,7 +300,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (117);
+insert into ttrss_version values (118);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -478,5 +479,15 @@ create table ttrss_plugin_storage (
 	content longtext not null,
   	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
+create table ttrss_error_log(
+	id integer not null auto_increment primary key,
+	owner_uid integer,
+	errno integer not null,
+	errstr text not null,
+	filename text not null,
+	lineno integer not null,	
+	context text not null,
+	created_at datetime not null,
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE SET NULL) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
 commit;
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 3fc58555d..d81f65f2b 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -1,3 +1,4 @@
+drop table if exists ttrss_error_log;
 drop table if exists ttrss_plugin_storage;
 drop table if exists ttrss_linked_feeds;
 drop table if exists ttrss_linked_instances;
@@ -257,7 +258,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (117);
+insert into ttrss_version values (118);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -421,4 +422,14 @@ create table ttrss_plugin_storage (
 	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
 	content text not null);
 
+create table ttrss_error_log(
+	id serial not null primary key,
+	owner_uid integer references ttrss_users(id) ON DELETE SET NULL,
+	errno integer not null,
+	errstr text not null,
+	filename text not null,
+	lineno integer not null,	
+	context text not null,
+	created_at timestamp not null);
+
 commit;
diff --git a/schema/versions/mysql/118.sql b/schema/versions/mysql/118.sql
new file mode 100644
index 000000000..add2b0c1f
--- /dev/null
+++ b/schema/versions/mysql/118.sql
@@ -0,0 +1,16 @@
+begin;
+
+create table ttrss_error_log(
+	id integer not null auto_increment primary key,
+	owner_uid integer,
+	errno integer not null,
+	errstr text not null,
+	filename text not null,
+	lineno integer not null,	
+	context text not null,
+	created_at datetime not null,
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE SET NULL) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+update ttrss_version set schema_version = 118;
+
+commit;
diff --git a/schema/versions/pgsql/118.sql b/schema/versions/pgsql/118.sql
new file mode 100644
index 000000000..161cf4e3c
--- /dev/null
+++ b/schema/versions/pgsql/118.sql
@@ -0,0 +1,15 @@
+begin;
+
+create table ttrss_error_log(
+	id serial not null primary key,
+	owner_uid integer references ttrss_users(id) ON DELETE SET NULL,
+	errno integer not null,
+	errstr text not null,
+	filename text not null,
+	lineno integer not null,	
+	context text not null,
+	created_at timestamp not null);
+
+update ttrss_version set schema_version = 118;
+
+commit;
-- 
cgit v1.2.3-54-g00ecf


From 438a3ecb04f9889f281ef1c72d6932b8c367deb5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 20:40:14 +0400
Subject: disable FOLLOWLOCATION when under open_basedir

---
 include/functions.php      | 4 ++--
 plugins/af_unburn/init.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 621357ea6..0148d069d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -324,7 +324,7 @@
 
 		if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) {
 
-			if (ini_get("safe_mode")) {
+			if (ini_get("safe_mode") || ini_get("open_basedir")) {
 				$ch = curl_init(geturl($url));
 			} else {
 				$ch = curl_init($url);
@@ -337,7 +337,7 @@
 
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
 			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
-			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode"));
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode") && !ini_get("open_basedir"));
 			curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
 			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/plugins/af_unburn/init.php b/plugins/af_unburn/init.php
index 9f0b6cb0d..f3cc1eefa 100644
--- a/plugins/af_unburn/init.php
+++ b/plugins/af_unburn/init.php
@@ -29,7 +29,7 @@ class Af_Unburn extends Plugin {
 
 			if (strpos($article["plugin_data"], "unburn,$owner_uid:") === FALSE) {
 
-				if (ini_get("safe_mode")) {
+				if (ini_get("safe_mode") || ini_get("open_basedir")) {
 					$ch = curl_init(geturl($article["link"]));
 				} else {
 					$ch = curl_init($article["link"]);
@@ -38,7 +38,7 @@ class Af_Unburn extends Plugin {
 				curl_setopt($ch, CURLOPT_TIMEOUT, 5);
 				curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 				curl_setopt($ch, CURLOPT_HEADER, true);
-				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode"));
+				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode") && !ini_get("open_basedir"));
 				curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
 
 				$contents = @curl_exec($ch);
-- 
cgit v1.2.3-54-g00ecf


From 89473cb5c62f886ffa06642dacf53254e584d21f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 09:09:51 +0400
Subject: feedtree: don't request null icon

---
 include/functions.php | 2 ++
 js/FeedTree.js        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 0148d069d..43138a1f9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1851,6 +1851,8 @@
 			}
 			break;
 		}
+
+		return false;
 	}
 
 	function getFeedTitle($link, $id, $cat = false) {
diff --git a/js/FeedTree.js b/js/FeedTree.js
index bb50d6fbb..fbddb708f 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -100,7 +100,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 	_createTreeNode: function(args) {
 		var tnode = new dijit._TreeNode(args);
 
-		if (args.item.icon)
+		if (args.item.icon && args.item.icon[0])
 			tnode.iconNode.src = args.item.icon[0];
 
 		var id = args.item.id[0];
-- 
cgit v1.2.3-54-g00ecf


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()

---
 api/index.php              |  2 +-
 backend.php                |  2 +-
 classes/db.php             |  5 +++++
 classes/db/mysql.php       | 10 ++++++++++
 classes/db/pgsql.php       |  8 ++++++++
 classes/idb.php            |  1 +
 include/functions.php      | 38 +++++---------------------------------
 index.php                  |  2 +-
 opml.php                   |  2 +-
 plugins/mobile/article.php |  2 +-
 plugins/mobile/backend.php |  2 +-
 plugins/mobile/cat.php     |  2 +-
 plugins/mobile/feed.php    |  2 +-
 plugins/mobile/home.php    |  2 +-
 plugins/mobile/index.php   |  2 +-
 plugins/mobile/prefs.php   |  2 +-
 prefs.php                  |  2 +-
 public.php                 |  2 +-
 register.php               |  2 +-
 update.php                 |  2 +-
 update_daemon2.php         |  6 +++---
 21 files changed, 47 insertions(+), 51 deletions(-)

(limited to 'include/functions.php')

diff --git a/api/index.php b/api/index.php
index 53b78b010..823b9527e 100644
--- a/api/index.php
+++ b/api/index.php
@@ -54,7 +54,7 @@
 		@session_start();
 	}
 
-	if (!init_connection($link)) return;
+	if (!init_plugins($link)) return;
 
 	$method = strtolower($_REQUEST["op"]);
 
diff --git a/backend.php b/backend.php
index 6ee0e081f..40e40aeb3 100644
--- a/backend.php
+++ b/backend.php
@@ -49,7 +49,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_connection($link)) return;
+	if (!init_plugins($link)) return;
 
 	header("Content-Type: text/json; charset=utf-8");
 
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);
diff --git a/include/functions.php b/include/functions.php
index 43138a1f9..0a686e71e 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3371,41 +3371,13 @@
 		return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
 	}
 
-	function init_connection_only($link) {
-		if ($link) {
-			if (DB_TYPE == "pgsql") {
-				pg_query($link, "set client_encoding = 'UTF-8'");
-				pg_set_client_encoding("UNICODE");
-				pg_query($link, "set datestyle = 'ISO, european'");
-				pg_query($link, "set TIME ZONE 0");
-			} else {
-				db_query($link, "SET time_zone = '+0:0'");
-
-				if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-					db_query($link, "SET NAMES " . MYSQL_CHARSET);
-				}
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	function init_connection($link) {
-		if ($link) {
-			init_connection_only($link);
-
-			global $pluginhost;
+	function init_plugins($link) {
+		global $pluginhost;
 
-			$pluginhost = new PluginHost($link);
-			$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
+		$pluginhost = new PluginHost($link);
+		$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
 
-			return true;
-		} else {
-			print "Unable to connect to database:" . db_last_error();
-			return false;
-		}
+		return true;
 	}
 
 	function format_tags_string($tags, $id) {
diff --git a/index.php b/index.php
index 066b25fa5..c21b46809 100644
--- a/index.php
+++ b/index.php
@@ -31,7 +31,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_connection($link)) return;
+	if (!init_plugins($link)) return;
 
 	global $pluginhost;
 
diff --git a/opml.php b/opml.php
index b8c9fb6c5..ad866fbd5 100644
--- a/opml.php
+++ b/opml.php
@@ -11,7 +11,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_connection($link)) return;
+	if (!init_plugins($link)) return;
 
 	$op = $_REQUEST['op'];
 
diff --git a/plugins/mobile/article.php b/plugins/mobile/article.php
index f6aed994f..c73c0fca5 100644
--- a/plugins/mobile/article.php
+++ b/plugins/mobile/article.php
@@ -18,7 +18,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 
diff --git a/plugins/mobile/backend.php b/plugins/mobile/backend.php
index a88e02a92..dc657ed40 100644
--- a/plugins/mobile/backend.php
+++ b/plugins/mobile/backend.php
@@ -23,7 +23,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	if (!$_SESSION["uid"]) return;
 
diff --git a/plugins/mobile/cat.php b/plugins/mobile/cat.php
index 7b5cf43f9..acd7f6f34 100644
--- a/plugins/mobile/cat.php
+++ b/plugins/mobile/cat.php
@@ -18,7 +18,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 
diff --git a/plugins/mobile/feed.php b/plugins/mobile/feed.php
index 6eae741ac..22590f195 100644
--- a/plugins/mobile/feed.php
+++ b/plugins/mobile/feed.php
@@ -18,7 +18,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 
diff --git a/plugins/mobile/home.php b/plugins/mobile/home.php
index 03fccb3e2..f0ebf6a11 100644
--- a/plugins/mobile/home.php
+++ b/plugins/mobile/home.php
@@ -18,7 +18,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 
diff --git a/plugins/mobile/index.php b/plugins/mobile/index.php
index 3feec7531..3fd496d04 100644
--- a/plugins/mobile/index.php
+++ b/plugins/mobile/index.php
@@ -18,7 +18,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 ?>
diff --git a/plugins/mobile/prefs.php b/plugins/mobile/prefs.php
index 323196254..e6d4a7b40 100644
--- a/plugins/mobile/prefs.php
+++ b/plugins/mobile/prefs.php
@@ -20,7 +20,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 ?>
diff --git a/prefs.php b/prefs.php
index e3b62da70..046d5eb76 100644
--- a/prefs.php
+++ b/prefs.php
@@ -21,7 +21,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_connection($link)) return;
+	if (!init_plugins($link)) return;
 
 	login_sequence($link);
 
diff --git a/public.php b/public.php
index 8477f95fc..1a50538fb 100644
--- a/public.php
+++ b/public.php
@@ -30,7 +30,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_connection($link)) return;
+	if (!init_plugins($link)) return;
 
 	if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
 		ob_start("ob_gzhandler");
diff --git a/register.php b/register.php
index 53627d912..9aec6dde7 100644
--- a/register.php
+++ b/register.php
@@ -19,7 +19,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_connection($link)) return;
+	if (!init_plugins($link)) return;
 
 	if ($_REQUEST["format"] == "feed") {
 		header("Content-Type: text/xml");
diff --git a/update.php b/update.php
index 1c43cdb94..ffe54cc7c 100755
--- a/update.php
+++ b/update.php
@@ -21,7 +21,7 @@
 	// Create a database connection.
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	$longopts = array("feeds",
 			"feedbrowser",
diff --git a/update_daemon2.php b/update_daemon2.php
index 77d05be66..e8a56eec9 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -177,7 +177,7 @@
 	// It is unnecessary to start the fork loop if database is not ok.
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_connection($link)) die("Can't initialize db connection.\n");
+	if (!init_plugins($link)) die("Can't initialize db connection.\n");
 
 	$schema_version = get_schema_version($link);
 
@@ -203,7 +203,7 @@
 			/* Check if schema version changed */
 
 			$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-			if (!init_connection($link)) die("Can't initialize db connection.\n");
+			if (!init_plugins($link)) die("Can't initialize db connection.\n");
 			$test_schema_version = get_schema_version($link);
 			db_close($link);
 
@@ -255,7 +255,7 @@
 
 					$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-					if (!init_connection($link)) return;
+					if (!init_plugins($link)) return;
 
 					// We disable stamp file, since it is of no use in a multiprocess update.
 					// not really, tho for the time being -fox
-- 
cgit v1.2.3-54-g00ecf


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

---
 api/index.php              |   1 +
 backend.php                |   1 +
 classes/db.php             |   8 ++--
 classes/db/mysql.php       |   3 ++
 classes/db/pgsql.php       |   2 +
 classes/sessionhandler.php |  73 +++++++++++++++++++++++++++++
 include/autoload.php       |  12 +++++
 include/db.php             | 114 ++++-----------------------------------------
 include/errorhandler.php   |   8 ++--
 include/functions.php      |  11 -----
 include/sessions.php       |  90 ++++++++++-------------------------
 index.php                  |   1 +
 opml.php                   |   1 +
 prefs.php                  |   1 +
 public.php                 |   1 +
 register.php               |   2 +-
 update.php                 |   1 +
 update_daemon2.php         |   1 +
 18 files changed, 143 insertions(+), 188 deletions(-)
 create mode 100644 classes/sessionhandler.php
 create mode 100644 include/autoload.php

(limited to 'include/functions.php')

diff --git a/api/index.php b/api/index.php
index 823b9527e..d28ab763a 100644
--- a/api/index.php
+++ b/api/index.php
@@ -13,6 +13,7 @@
 	define('TTRSS_SESSION_NAME', 'ttrss_api_sid');
 	define('NO_SESSION_AUTOSTART', true);
 
+	require_once "autoload.php";
 	require_once "db.php";
 	require_once "db-prefs.php";
 	require_once "functions.php";
diff --git a/backend.php b/backend.php
index 40e40aeb3..b583d379e 100644
--- a/backend.php
+++ b/backend.php
@@ -37,6 +37,7 @@
 
 	@$csrf_token = $_REQUEST['csrf_token'];
 
+	require_once "autoload.php";
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "config.php";
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;
+	}
+
+}
+?>
diff --git a/include/autoload.php b/include/autoload.php
new file mode 100644
index 000000000..40c63d547
--- /dev/null
+++ b/include/autoload.php
@@ -0,0 +1,12 @@
+<?php
+	function __autoload($class) {
+		$class_file = str_replace("_", "/", strtolower(basename($class)));
+
+		$file = dirname(__FILE__)."/../classes/$class_file.php";
+
+		if (file_exists($file)) {
+			require $file;
+		}
+
+	}
+?>
diff --git a/include/db.php b/include/db.php
index a70a1d878..cfa4ccda5 100644
--- a/include/db.php
+++ b/include/db.php
@@ -1,138 +1,44 @@
 <?php
 
-require_once "config.php";
-
 function db_connect($host, $user, $pass, $db) {
-	if (DB_TYPE == "pgsql") {
-
-		$string = "dbname=$db user=$user";
-
-		if ($pass) {
-			$string .= " password=$pass";
-		}
-
-		if ($host) {
-			$string .= " host=$host";
-		}
-
-		if (defined('DB_PORT') && DB_PORT) {
-			$string = "$string port=" . DB_PORT;
-		}
-
-		$link = pg_connect($string);
-
-		if (!$link) {
-			die("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
-		}
-
-		return $link;
-
-	} else if (DB_TYPE == "mysql") {
-		$link = mysql_connect($host, $user, $pass);
-		if ($link) {
-			$result = mysql_select_db($db, $link);
-			if (!$result) {
-				die("Can't select DB: " . mysql_error($link));
-			}
-			return $link;
-		} else {
-			die("Unable to connect to database (as $user to $host, database $db): " . mysql_error());
-		}
-	}
+	return Db::get()->connect($host, $user, $pass, $db, 0);
 }
 
 function db_escape_string($link, $s, $strip_tags = true) {
-	if ($strip_tags) $s = strip_tags($s);
-
-	if (DB_TYPE == "pgsql") {
-		return pg_escape_string($link, $s);
-	} else {
-		return mysql_real_escape_string($s, $link);
-	}
+	return Db::get()->escape_string($s, $strip_tags);
 }
 
 function db_query($link, $query, $die_on_error = true) {
-	if (DB_TYPE == "pgsql") {
-		$result = pg_query($link, $query);
-		if (!$result) {
-			$query = htmlspecialchars($query); // just in case
-			if ($die_on_error) {
-				die("Query <i>$query</i> failed [$result]: " . ($link ? pg_last_error($link) : "No connection"));
-			}
-		}
-		return $result;
-	} else if (DB_TYPE == "mysql") {
-		$result = mysql_query($query, $link);
-		if (!$result) {
-			$query = htmlspecialchars($query);
-			if ($die_on_error) {
-				die("Query <i>$query</i> failed: " . ($link ? mysql_error($link) : "No connection"));
-			}
-		}
-		return $result;
-	}
+	return Db::get()->query($query, $die_on_error);
 }
 
 function db_fetch_assoc($result) {
-	if (DB_TYPE == "pgsql") {
-		return pg_fetch_assoc($result);
-	} else if (DB_TYPE == "mysql") {
-		return mysql_fetch_assoc($result);
-	}
+	return Db::get()->fetch_assoc($result);
 }
 
 
 function db_num_rows($result) {
-	if (DB_TYPE == "pgsql") {
-		return pg_num_rows($result);
-	} else if (DB_TYPE == "mysql") {
-		return mysql_num_rows($result);
-	}
+	return Db::get()->num_rows($result);
 }
 
 function db_fetch_result($result, $row, $param) {
-	if (DB_TYPE == "pgsql") {
-		return pg_fetch_result($result, $row, $param);
-	} else if (DB_TYPE == "mysql") {
-		// I hate incoherent naming of PHP functions
-		return mysql_result($result, $row, $param);
-	}
-}
-
-function db_unescape_string($str) {
-	$tmp = str_replace("\\\"", "\"", $str);
-	$tmp = str_replace("\\'", "'", $tmp);
-	return $tmp;
+	return Db::get()->fetch_result($result, $row, $param);
 }
 
 function db_close($link) {
-	if (DB_TYPE == "pgsql") {
-
-		return pg_close($link);
-
-	} else if (DB_TYPE == "mysql") {
-		return mysql_close($link);
-	}
+	return Db::get()->close();
 }
 
 function db_affected_rows($link, $result) {
-	if (DB_TYPE == "pgsql") {
-		return pg_affected_rows($result);
-	} else if (DB_TYPE == "mysql") {
-		return mysql_affected_rows($link);
-	}
+	return Db::get()->affected_rows($result);
 }
 
 function db_last_error($link) {
-	if (DB_TYPE == "pgsql") {
-		return pg_last_error($link);
-	} else if (DB_TYPE == "mysql") {
-		return mysql_error($link);
-	}
+	return Db::get()->last_error();
 }
 
 function db_quote($str){
-	return("'$str'");
+	return Db::get()->quote($str);
 }
 
 ?>
diff --git a/include/errorhandler.php b/include/errorhandler.php
index f7fadc172..45496b18b 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -1,7 +1,7 @@
 <?php
 // TODO: make configurable
-require_once "classes/logger.php";
-require_once "classes/logger/sql.php";
+//require_once "classes/logger.php";
+//require_once "classes/logger/sql.php";
 
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
 	global $logger;
@@ -42,6 +42,6 @@ function ttrss_fatal_handler() {
 	}
 }
 
-register_shutdown_function('ttrss_fatal_handler');
-set_error_handler('ttrss_error_handler');
+//register_shutdown_function('ttrss_fatal_handler');
+//set_error_handler('ttrss_error_handler');
 ?>
diff --git a/include/functions.php b/include/functions.php
index 0a686e71e..f0d5e85fa 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -10,17 +10,6 @@
 	$fetch_last_content_type = false;
 	$pluginhost = false;
 
-	function __autoload($class) {
-		$class_file = str_replace("_", "/", strtolower(basename($class)));
-
-		$file = dirname(__FILE__)."/../classes/$class_file.php";
-
-		if (file_exists($file)) {
-			require $file;
-		}
-
-	}
-
 	mb_internal_encoding("UTF-8");
 	date_default_timezone_set('UTC');
 	if (defined('E_DEPRECATED')) {
diff --git a/include/sessions.php b/include/sessions.php
index bc8b7cff1..f6e8bfe61 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -2,7 +2,8 @@
 	// Original from http://www.daniweb.com/code/snippet43.html
 
 	require_once "config.php";
-	require_once "db.php";
+	require_once "classes/db.php";
+	require_once "autoload.php";
 	require_once "errorhandler.php";
 	require_once "lib/accept-to-gettext.php";
 	require_once "lib/gettext/gettext.inc";
@@ -22,14 +23,12 @@
 	ini_set("session.gc_maxlifetime", $session_expire);
 	ini_set("session.cookie_lifetime", min(0, SESSION_COOKIE_LIFETIME));
 
-	global $session_connection;
-
-	function session_get_schema_version($link, $nocache = false) {
+	function session_get_schema_version($nocache = false) {
 		global $schema_version;
 
 		if (!$schema_version) {
-			$result = db_query($link, "SELECT schema_version FROM ttrss_version");
-			$version = db_fetch_result($result, 0, "schema_version");
+			$result = Db::get()->query("SELECT schema_version FROM ttrss_version");
+			$version = Db::get()->fetch_result($result, 0, "schema_version");
 			$schema_version = $version;
 			return $version;
 		} else {
@@ -39,7 +38,6 @@
 
 	function validate_session($link) {
 		if (SINGLE_USER_MODE) return true;
-		if (!$link) return false;
 
 		if (VERSION != $_SESSION["version"]) return false;
 
@@ -64,21 +62,21 @@
 			return false;
 		}
 
-		if ($_SESSION["ref_schema_version"] != session_get_schema_version($link, true))
+		if ($_SESSION["ref_schema_version"] != session_get_schema_version(true))
 			return false;
 
 		if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"])
 			return false;
 
 		if ($_SESSION["uid"]) {
-			$result = db_query($link,
+			$result = Db::get()->query(
 				"SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");
 
 			// user not found
-			if (db_num_rows($result) == 0) {
+			if (Db::get()->num_rows($result) == 0) {
 				return false;
 			} else {
-				$pwd_hash = db_fetch_result($result, 0, "pwd_hash");
+				$pwd_hash = Db::get()->fetch_result($result, 0, "pwd_hash");
 
 				if ($pwd_hash != $_SESSION["pwd_hash"]) {
 					return false;
@@ -86,101 +84,63 @@
 			}
 		}
 
-/*		if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) {
-
-			//print_r($_SESSION);
-
-			if (time() > $_SESSION["cookie_lifetime"]) {
-				return false;
-			}
-		} */
-
 		return true;
 	}
 
 
 	function ttrss_open ($s, $n) {
-		global $session_connection;
-
-		$session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
 		return true;
 	}
 
 	function ttrss_read ($id){
+		global $session_expire;
+
+		$res = Db::get()->query("SELECT data FROM ttrss_sessions WHERE id='$id'");
 
-		global $session_connection,$session_read;
+		if (Db::get()->num_rows($res) != 1) {
 
-		$query = "SELECT data FROM ttrss_sessions WHERE id='$id'";
+			$expire = time() + $session_expire;
 
-		$res = db_query($session_connection, $query);
+			Db::get()->query("INSERT INTO ttrss_sessions (id, data, expire)
+					VALUES ('$id', '', '$expire')");
 
-		if (db_num_rows($res) != 1) {
 		 	return "";
 		} else {
-			$session_read = db_fetch_assoc($res);
-			$session_read["data"] = base64_decode($session_read["data"]);
-			return $session_read["data"];
+			return base64_decode(Db::get()->fetch_result($res, 0, "data"));
 		}
+
 	}
 
 	function ttrss_write ($id, $data) {
+		global $session_expire;
 
-		if (! $data) {
-			return false;
-		}
-
-		global $session_connection, $session_read, $session_expire;
-
+		$data = base64_encode($data);
 		$expire = time() + $session_expire;
 
-		$data = db_escape_string($session_connection, base64_encode($data), false);
-
-		if ($session_read) {
-		 	$query = "UPDATE ttrss_sessions SET data='$data',
-					expire='$expire' WHERE id='$id'";
-		} else {
-		 	$query = "INSERT INTO ttrss_sessions (id, data, expire)
-					VALUES ('$id', '$data', '$expire')";
-		}
+		Db::get()->query("UPDATE ttrss_sessions SET data='$data', expire='$expire' WHERE id='$id'");
 
-		db_query($session_connection, $query);
 		return true;
 	}
 
 	function ttrss_close () {
-
-		global $session_connection;
-
-		//db_close($session_connection);
-
 		return true;
 	}
 
-	function ttrss_destroy ($id) {
-
-		global $session_connection;
-
-		$query = "DELETE FROM ttrss_sessions WHERE id = '$id'";
-
-		db_query($session_connection, $query);
+	function ttrss_destroy($id) {
+		Db::get()->query("DELETE FROM ttrss_sessions WHERE id = '$id'");
 
 		return true;
 	}
 
 	function ttrss_gc ($expire) {
-
-		global $session_connection;
-
-		$query = "DELETE FROM ttrss_sessions WHERE expire < " . time();
-
-		db_query($session_connection, $query);
+		Db::get()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
 	}
 
 	if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) {
 		session_set_save_handler("ttrss_open",
 			"ttrss_close", "ttrss_read", "ttrss_write",
 			"ttrss_destroy", "ttrss_gc");
+		register_shutdown_function('session_write_close');
 	}
 
 	if (!defined('NO_SESSION_AUTOSTART')) {
diff --git a/index.php b/index.php
index c21b46809..66e236dae 100644
--- a/index.php
+++ b/index.php
@@ -19,6 +19,7 @@
 	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
 		get_include_path());
 
+	require_once "autoload.php";
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
diff --git a/opml.php b/opml.php
index ad866fbd5..709cfd4cc 100644
--- a/opml.php
+++ b/opml.php
@@ -2,6 +2,7 @@
 	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
 		get_include_path());
 
+	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "sanity_check.php";
diff --git a/prefs.php b/prefs.php
index 046d5eb76..7a7d2842c 100644
--- a/prefs.php
+++ b/prefs.php
@@ -12,6 +12,7 @@
 		exit;
 	}
 
+	require_once "autoload.php";
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
diff --git a/public.php b/public.php
index 1a50538fb..ae6ae44b2 100644
--- a/public.php
+++ b/public.php
@@ -17,6 +17,7 @@
 		$_REQUEST = array_map('stripslashes_deep', $_REQUEST);
 	}
 
+	require_once "autoload.php";
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
diff --git a/register.php b/register.php
index 9aec6dde7..d7c60d4f0 100644
--- a/register.php
+++ b/register.php
@@ -8,7 +8,7 @@
 		get_include_path());
 
 	require_once 'classes/ttrssmailer.php';
-
+	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "sanity_check.php";
diff --git a/update.php b/update.php
index ffe54cc7c..d9009f965 100755
--- a/update.php
+++ b/update.php
@@ -7,6 +7,7 @@
 
 	chdir(dirname(__FILE__));
 
+	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "rssfuncs.php";
 	require_once "config.php";
diff --git a/update_daemon2.php b/update_daemon2.php
index e8a56eec9..6d13add00 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -14,6 +14,7 @@
 		define('DAEMON_EXTENDED_DEBUG', true);
 	}
 
+	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "rssfuncs.php";
 	require_once "sanity_check.php";
-- 
cgit v1.2.3-54-g00ecf


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

---
 backend.php                         |  14 +-
 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 +++++++--------
 include/ccache.php                  |  78 ++---
 include/db-prefs.php                |  26 +-
 include/db.php                      |  10 +-
 include/digest.php                  |  26 +-
 include/feedbrowser.php             |   8 +-
 include/functions.php               | 550 ++++++++++++++++++------------------
 include/labels.php                  |  82 +++---
 include/rssfuncs.php                | 212 +++++++-------
 include/sanity_check.php            |  14 +-
 include/sessions.php                |   2 +-
 index.php                           |  10 +-
 opml.php                            |  10 +-
 plugins/af_buttersafe/init.php      |   2 -
 plugins/af_explosm/init.php         |   2 -
 plugins/af_gocomics/init.php        |   3 -
 plugins/af_pennyarcade/init.php     |  18 +-
 plugins/af_redditimgur/init.php     |   3 -
 plugins/af_unburn/init.php          |   3 -
 plugins/auth_internal/init.php      |  31 +-
 plugins/auth_remote/init.php        |  22 +-
 plugins/bookmarklets/init.php       |   2 -
 plugins/close_button/init.php       |   4 +-
 plugins/digest/digest_body.php      |   4 +-
 plugins/digest/init.php             |  30 +-
 plugins/embed_original/init.php     |   6 +-
 plugins/example/init.php            |   5 +-
 plugins/example_api/init.php        |   2 -
 plugins/example_article/init.php    |   2 -
 plugins/example_feed/init.php       |   2 -
 plugins/example_routing/init.php    |   2 -
 plugins/example_vfeed/init.php      |   4 +-
 plugins/googlereaderimport/init.php |  72 +++--
 plugins/googlereaderkeys/init.php   |   3 -
 plugins/import_export/init.php      |  47 ++-
 plugins/instances/init.php          |  71 +++--
 plugins/mail/init.php               |  12 +-
 plugins/mailto/init.php             |   7 +-
 plugins/mark_button/init.php        |   4 +-
 plugins/mobile/article.php          |  12 +-
 plugins/mobile/backend.php          |  24 +-
 plugins/mobile/cat.php              |   6 +-
 plugins/mobile/feed.php             |  14 +-
 plugins/mobile/home.php             |   8 +-
 plugins/mobile/index.php            |   8 +-
 plugins/mobile/init.php             |   3 -
 plugins/mobile/mobile-functions.php |  90 +++---
 plugins/mobile/prefs.php            |  14 +-
 plugins/note/init.php               |  12 +-
 plugins/nsfw/init.php               |   5 +-
 plugins/share/init.php              |  16 +-
 plugins/swap_jk/init.php            |   2 -
 plugins/updater/init.php            |  14 +-
 prefs.php                           |  10 +-
 public.php                          |   6 +-
 register.php                        |  28 +-
 update.php                          |  49 ++--
 update_daemon2.php                  |  30 +-
 80 files changed, 1624 insertions(+), 1727 deletions(-)

(limited to 'include/functions.php')

diff --git a/backend.php b/backend.php
index b583d379e..b06cca2d2 100644
--- a/backend.php
+++ b/backend.php
@@ -50,7 +50,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_plugins($link)) return;
+	if (!init_plugins()) return;
 
 	header("Content-Type: text/json; charset=utf-8");
 
@@ -59,16 +59,16 @@
 	}
 
 	if (SINGLE_USER_MODE) {
-		authenticate_user($link, "admin", null);
+		authenticate_user( "admin", null);
 	}
 
 	if ($_SESSION["uid"]) {
-		if (!validate_session($link)) {
+		if (!validate_session()) {
 			header("Content-Type: text/json");
 			print json_encode(array("error" => array("code" => 6)));
 			return;
 		}
-		load_user_plugins($link, $_SESSION["uid"]);
+		load_user_plugins( $_SESSION["uid"]);
 	}
 
 	$purge_intervals = array(
@@ -106,7 +106,7 @@
 		5 => __("Power User"),
 		10 => __("Administrator"));
 
-	#$error = sanity_check($link);
+	#$error = sanity_check();
 
 	#if ($error['code'] != 0 && $op != "logout") {
 	#	print json_encode(array("error" => $error));
@@ -123,7 +123,7 @@
 		if ($override) {
 			$handler = $override;
 		} else {
-			$handler = new $op($link, $_REQUEST);
+			$handler = new $op(Db::get(), $_REQUEST);
 		}
 
 		if ($handler && implements_interface($handler, 'IHandler')) {
@@ -155,5 +155,5 @@
 	print json_encode(array("error" => array("code" => 7)));
 
 	// We close the connection to database.
-	db_close($link);
+	db_close();
 ?>
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) {
diff --git a/include/ccache.php b/include/ccache.php
index c53b1a08c..10e70ffe3 100644
--- a/include/ccache.php
+++ b/include/ccache.php
@@ -1,19 +1,19 @@
 <?php
-	/* function ccache_zero($link, $feed_id, $owner_uid) {
-		db_query($link, "UPDATE ttrss_counters_cache SET
+	/* function ccache_zero( $feed_id, $owner_uid) {
+		db_query( "UPDATE ttrss_counters_cache SET
 			value = 0, updated = NOW() WHERE
 			feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
 	} */
 
-	function ccache_zero_all($link, $owner_uid) {
-		db_query($link, "UPDATE ttrss_counters_cache SET
+	function ccache_zero_all( $owner_uid) {
+		db_query( "UPDATE ttrss_counters_cache SET
 			value = 0 WHERE owner_uid = '$owner_uid'");
 
-		db_query($link, "UPDATE ttrss_cat_counters_cache SET
+		db_query( "UPDATE ttrss_cat_counters_cache SET
 			value = 0 WHERE owner_uid = '$owner_uid'");
 	}
 
-	function ccache_remove($link, $feed_id, $owner_uid, $is_cat = false) {
+	function ccache_remove( $feed_id, $owner_uid, $is_cat = false) {
 
 		if (!$is_cat) {
 			$table = "ttrss_counters_cache";
@@ -21,39 +21,39 @@
 			$table = "ttrss_cat_counters_cache";
 		}
 
-		db_query($link, "DELETE FROM $table WHERE
+		db_query( "DELETE FROM $table WHERE
 			feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
 
 	}
 
-	function ccache_update_all($link, $owner_uid) {
+	function ccache_update_all( $owner_uid) {
 
-		if (get_pref($link, 'ENABLE_FEED_CATS', $owner_uid)) {
+		if (get_pref( 'ENABLE_FEED_CATS', $owner_uid)) {
 
-			$result = db_query($link, "SELECT feed_id FROM ttrss_cat_counters_cache
+			$result = db_query( "SELECT feed_id FROM ttrss_cat_counters_cache
 				WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
 
 			while ($line = db_fetch_assoc($result)) {
-				ccache_update($link, $line["feed_id"], $owner_uid, true);
+				ccache_update( $line["feed_id"], $owner_uid, true);
 			}
 
 			/* We have to manually include category 0 */
 
-			ccache_update($link, 0, $owner_uid, true);
+			ccache_update( 0, $owner_uid, true);
 
 		} else {
-			$result = db_query($link, "SELECT feed_id FROM ttrss_counters_cache
+			$result = db_query( "SELECT feed_id FROM ttrss_counters_cache
 				WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
 
 			while ($line = db_fetch_assoc($result)) {
-				print ccache_update($link, $line["feed_id"], $owner_uid);
+				print ccache_update( $line["feed_id"], $owner_uid);
 
 			}
 
 		}
 	}
 
-	function ccache_find($link, $feed_id, $owner_uid, $is_cat = false,
+	function ccache_find( $feed_id, $owner_uid, $is_cat = false,
 		$no_update = false) {
 
 		if (!is_numeric($feed_id)) return;
@@ -61,7 +61,7 @@
 		if (!$is_cat) {
 			$table = "ttrss_counters_cache";
 			/* if ($feed_id > 0) {
-				$tmp_result = db_query($link, "SELECT owner_uid FROM ttrss_feeds
+				$tmp_result = db_query( "SELECT owner_uid FROM ttrss_feeds
 					WHERE id = '$feed_id'");
 				$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
 			} */
@@ -75,7 +75,7 @@
 			$date_qpart = "updated > DATE_SUB(NOW(), INTERVAL 15 MINUTE)";
 		}
 
-		$result = db_query($link, "SELECT value FROM $table
+		$result = db_query( "SELECT value FROM $table
 			WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id'
 			LIMIT 1");
 
@@ -85,30 +85,30 @@
 			if ($no_update) {
 				return -1;
 			} else {
-				return ccache_update($link, $feed_id, $owner_uid, $is_cat);
+				return ccache_update( $feed_id, $owner_uid, $is_cat);
 			}
 		}
 
 	}
 
-	function ccache_update($link, $feed_id, $owner_uid, $is_cat = false,
+	function ccache_update( $feed_id, $owner_uid, $is_cat = false,
 		$update_pcat = true) {
 
 		if (!is_numeric($feed_id)) return;
 
 		/* if (!$is_cat && $feed_id > 0) {
-			$tmp_result = db_query($link, "SELECT owner_uid FROM ttrss_feeds
+			$tmp_result = db_query( "SELECT owner_uid FROM ttrss_feeds
 				WHERE id = '$feed_id'");
 			$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
 		} */
 
-		$prev_unread = ccache_find($link, $feed_id, $owner_uid, $is_cat, true);
+		$prev_unread = ccache_find( $feed_id, $owner_uid, $is_cat, true);
 
 		/* When updating a label, all we need to do is recalculate feed counters
 		 * because labels are not cached */
 
 		if ($feed_id < 0) {
-			ccache_update_all($link, $owner_uid);
+			ccache_update_all( $owner_uid);
 			return;
 		}
 
@@ -127,14 +127,14 @@
 
 			/* Recalculate counters for child feeds */
 
-			$result = db_query($link, "SELECT id FROM ttrss_feeds
+			$result = db_query( "SELECT id FROM ttrss_feeds
 						WHERE owner_uid = '$owner_uid' AND $cat_qpart");
 
 			while ($line = db_fetch_assoc($result)) {
-				ccache_update($link, $line["id"], $owner_uid, false, false);
+				ccache_update( $line["id"], $owner_uid, false, false);
 			}
 
-			$result = db_query($link, "SELECT SUM(value) AS sv
+			$result = db_query( "SELECT SUM(value) AS sv
 				FROM ttrss_counters_cache, ttrss_feeds
 				WHERE id = feed_id AND $cat_qpart AND
 				ttrss_feeds.owner_uid = '$owner_uid'");
@@ -142,27 +142,27 @@
 			$unread = (int) db_fetch_result($result, 0, "sv");
 
 		} else {
-			$unread = (int) getFeedArticles($link, $feed_id, $is_cat, true, $owner_uid);
+			$unread = (int) getFeedArticles( $feed_id, $is_cat, true, $owner_uid);
 		}
 
-		db_query($link, "BEGIN");
+		db_query( "BEGIN");
 
-		$result = db_query($link, "SELECT feed_id FROM $table
+		$result = db_query( "SELECT feed_id FROM $table
 			WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id' LIMIT 1");
 
 		if (db_num_rows($result) == 1) {
-			db_query($link, "UPDATE $table SET
+			db_query( "UPDATE $table SET
 				value = '$unread', updated = NOW() WHERE
 				feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
 
 		} else {
-			db_query($link, "INSERT INTO $table
+			db_query( "INSERT INTO $table
 				(feed_id, value, owner_uid, updated)
 				VALUES
 				($feed_id, $unread, $owner_uid, NOW())");
 		}
 
-		db_query($link, "COMMIT");
+		db_query( "COMMIT");
 
 		if ($feed_id > 0 && $prev_unread != $unread) {
 
@@ -172,36 +172,36 @@
 
 				if ($update_pcat) {
 
-					$result = db_query($link, "SELECT cat_id FROM ttrss_feeds
+					$result = db_query( "SELECT cat_id FROM ttrss_feeds
 						WHERE owner_uid = '$owner_uid' AND id = '$feed_id'");
 
 					$cat_id = (int) db_fetch_result($result, 0, "cat_id");
 
-					ccache_update($link, $cat_id, $owner_uid, true);
+					ccache_update( $cat_id, $owner_uid, true);
 
 				}
 			}
 		} else if ($feed_id < 0) {
-			ccache_update_all($link, $owner_uid);
+			ccache_update_all( $owner_uid);
 		}
 
 		return $unread;
 	}
 
-	/* function ccache_cleanup($link, $owner_uid) {
+	/* function ccache_cleanup( $owner_uid) {
 
 		if (DB_TYPE == "pgsql") {
-			db_query($link, "DELETE FROM ttrss_counters_cache AS c1 WHERE
+			db_query( "DELETE FROM ttrss_counters_cache AS c1 WHERE
 				(SELECT count(*) FROM ttrss_counters_cache AS c2
 					WHERE c1.feed_id = c2.feed_id AND c2.owner_uid = c1.owner_uid) > 1
 					AND owner_uid = '$owner_uid'");
 
-			db_query($link, "DELETE FROM ttrss_cat_counters_cache AS c1 WHERE
+			db_query( "DELETE FROM ttrss_cat_counters_cache AS c1 WHERE
 				(SELECT count(*) FROM ttrss_cat_counters_cache AS c2
 					WHERE c1.feed_id = c2.feed_id AND c2.owner_uid = c1.owner_uid) > 1
 					AND owner_uid = '$owner_uid'");
 		} else {
-			db_query($link, "DELETE c1 FROM
+			db_query( "DELETE c1 FROM
 					ttrss_counters_cache AS c1,
 					ttrss_counters_cache AS c2
 				WHERE
@@ -209,7 +209,7 @@
 					c1.owner_uid = c2.owner_uid AND
 					c1.feed_id = c2.feed_id");
 
-			db_query($link, "DELETE c1 FROM
+			db_query( "DELETE c1 FROM
 					ttrss_cat_counters_cache AS c1,
 					ttrss_cat_counters_cache AS c2
 				WHERE
diff --git a/include/db-prefs.php b/include/db-prefs.php
index 1ee3d609a..d786e5349 100644
--- a/include/db-prefs.php
+++ b/include/db-prefs.php
@@ -7,7 +7,7 @@
 			$_SESSION["prefs_cache"] = array();
 	}
 
-	function cache_prefs($link) {
+	function cache_prefs() {
 		$profile = false;
 
 		$user_id = $_SESSION["uid"];
@@ -19,9 +19,9 @@
 			$profile_qpart = "profile IS NULL AND";
 		}
 
-		if (get_schema_version($link) < 63) $profile_qpart = "";
+		if (get_schema_version() < 63) $profile_qpart = "";
 
-		$result = db_query($link, "SELECT
+		$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
@@ -42,9 +42,9 @@
 		}
 	}
 
-	function get_pref($link, $pref_name, $user_id = false, $die_on_error = false) {
+	function get_pref( $pref_name, $user_id = false, $die_on_error = false) {
 
-		$pref_name = db_escape_string($link, $pref_name);
+		$pref_name = db_escape_string( $pref_name);
 		$prefs_cache = true;
 		$profile = false;
 
@@ -69,9 +69,9 @@
 			$profile_qpart = "profile IS NULL AND";
 		}
 
-		if (get_schema_version($link) < 63) $profile_qpart = "";
+		if (get_schema_version() < 63) $profile_qpart = "";
 
-		$result = db_query($link, "SELECT
+		$result = db_query( "SELECT
 			value,ttrss_prefs_types.type_name as type_name
 			FROM
 				ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
@@ -114,9 +114,9 @@
 		}
 	}
 
-	function set_pref($link, $pref_name, $value, $user_id = false, $strip_tags = true) {
-		$pref_name = db_escape_string($link, $pref_name);
-		$value = db_escape_string($link, $value, $strip_tags);
+	function set_pref( $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"];
@@ -132,7 +132,7 @@
 			$profile_qpart = "AND profile IS NULL";
 		}
 
-		if (get_schema_version($link) < 63) $profile_qpart = "";
+		if (get_schema_version() < 63) $profile_qpart = "";
 
 		$type_name = "";
 		$current_value = "";
@@ -145,7 +145,7 @@
 		}
 
 		if (!$type_name) {
-			$result = db_query($link, "SELECT 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");
 
@@ -170,7 +170,7 @@
 				$value = 'UTC';
 			}
 
-			db_query($link, "UPDATE ttrss_user_prefs SET
+			db_query( "UPDATE ttrss_user_prefs SET
 				value = '$value' WHERE pref_name = '$pref_name'
 					$profile_qpart
 					AND owner_uid = " . $_SESSION["uid"]);
diff --git a/include/db.php b/include/db.php
index cfa4ccda5..11e7312ad 100644
--- a/include/db.php
+++ b/include/db.php
@@ -4,11 +4,11 @@ function db_connect($host, $user, $pass, $db) {
 	return Db::get()->connect($host, $user, $pass, $db, 0);
 }
 
-function db_escape_string($link, $s, $strip_tags = true) {
+function db_escape_string( $s, $strip_tags = true) {
 	return Db::get()->escape_string($s, $strip_tags);
 }
 
-function db_query($link, $query, $die_on_error = true) {
+function db_query( $query, $die_on_error = true) {
 	return Db::get()->query($query, $die_on_error);
 }
 
@@ -25,15 +25,15 @@ function db_fetch_result($result, $row, $param) {
 	return Db::get()->fetch_result($result, $row, $param);
 }
 
-function db_close($link) {
+function db_close() {
 	return Db::get()->close();
 }
 
-function db_affected_rows($link, $result) {
+function db_affected_rows( $result) {
 	return Db::get()->affected_rows($result);
 }
 
-function db_last_error($link) {
+function db_last_error() {
 	return Db::get()->last_error();
 }
 
diff --git a/include/digest.php b/include/digest.php
index 34b699094..a3f414271 100644
--- a/include/digest.php
+++ b/include/digest.php
@@ -6,7 +6,7 @@
 	 * @param integer $limit The maximum number of articles by digest.
 	 * @return boolean Return false if digests are not enabled.
 	 */
-	function send_headlines_digests($link, $debug = false) {
+	function send_headlines_digests( $debug = false) {
 
 		require_once 'classes/ttrssmailer.php';
 
@@ -21,13 +21,13 @@
 			$interval_query = "last_digest_sent < DATE_SUB(NOW(), INTERVAL 1 DAY)";
 		}
 
-		$result = db_query($link, "SELECT id,email FROM ttrss_users
+		$result = db_query( "SELECT id,email FROM ttrss_users
 				WHERE email != '' AND (last_digest_sent IS NULL OR $interval_query)");
 
 		while ($line = db_fetch_assoc($result)) {
 
-			if (get_pref($link, 'DIGEST_ENABLE', $line['id'], false)) {
-				$preferred_ts = strtotime(get_pref($link, 'DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
+			if (get_pref( 'DIGEST_ENABLE', $line['id'], false)) {
+				$preferred_ts = strtotime(get_pref( 'DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
 
 				// try to send digests within 2 hours of preferred time
 				if ($preferred_ts && time() >= $preferred_ts &&
@@ -35,14 +35,14 @@
 
 					if ($debug) _debug("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
 
-					$do_catchup = get_pref($link, 'DIGEST_CATCHUP', $line['id'], false);
+					$do_catchup = get_pref( 'DIGEST_CATCHUP', $line['id'], false);
 
 					global $tz_offset;
 
 					// reset tz_offset global to prevent tz cache clash between users
 					$tz_offset = -1;
 
-					$tuple = prepare_headlines_digest($link, $line["id"], 1, $limit);
+					$tuple = prepare_headlines_digest( $line["id"], 1, $limit);
 					$digest = $tuple[0];
 					$headlines_count = $tuple[1];
 					$affected_ids = $tuple[2];
@@ -60,13 +60,13 @@
 
 						if ($rc && $do_catchup) {
 							if ($debug) _debug("Marking affected articles as read...");
-							catchupArticlesById($link, $affected_ids, 0, $line["id"]);
+							catchupArticlesById( $affected_ids, 0, $line["id"]);
 						}
 					} else {
 						if ($debug) _debug("No headlines");
 					}
 
-					db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW()
+					db_query( "UPDATE ttrss_users SET last_digest_sent = NOW()
 						WHERE id = " . $line["id"]);
 
 				}
@@ -77,7 +77,7 @@
 
 	}
 
-	function prepare_headlines_digest($link, $user_id, $days = 1, $limit = 1000) {
+	function prepare_headlines_digest( $user_id, $days = 1, $limit = 1000) {
 
 		require_once "lib/MiniTemplator.class.php";
 
@@ -87,7 +87,7 @@
 		$tpl->readTemplateFromFile("templates/digest_template_html.txt");
 		$tpl_t->readTemplateFromFile("templates/digest_template.txt");
 
-		$user_tz_string = get_pref($link, 'USER_TIMEZONE', $user_id);
+		$user_tz_string = get_pref( 'USER_TIMEZONE', $user_id);
 		$local_ts = convert_timestamp(time(), 'UTC', $user_tz_string);
 
 		$tpl->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
@@ -104,7 +104,7 @@
 			$interval_query = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
 		}
 
-		$result = db_query($link, "SELECT ttrss_entries.title,
+		$result = db_query( "SELECT ttrss_entries.title,
 				ttrss_feeds.title AS feed_title,
 				COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS cat_title,
 				date_updated,
@@ -143,7 +143,7 @@
 
 			array_push($affected_ids, $line["ref_id"]);
 
-			$updated = make_local_datetime($link, $line['last_updated'], false,
+			$updated = make_local_datetime( $line['last_updated'], false,
 				$user_id);
 
 /*			if ($line["score"] != 0) {
@@ -152,7 +152,7 @@
 				$line["title"] .= " (".$line['score'].")";
 			} */
 
-			if (get_pref($link, 'ENABLE_FEED_CATS', $user_id)) {
+			if (get_pref( 'ENABLE_FEED_CATS', $user_id)) {
 				$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
 			}
 
diff --git a/include/feedbrowser.php b/include/feedbrowser.php
index e5ee4a70d..7bafe68ac 100644
--- a/include/feedbrowser.php
+++ b/include/feedbrowser.php
@@ -1,5 +1,5 @@
 <?php
-	function make_feed_browser($link, $search, $limit, $mode = 1) {
+	function make_feed_browser( $search, $limit, $mode = 1) {
 
 		$owner_uid = $_SESSION["uid"];
 		$rv = '';
@@ -12,13 +12,13 @@
 		}
 
 		if ($mode == 1) {
-			/* $result = db_query($link, "SELECT feed_url, subscribers FROM
+			/* $result = db_query( "SELECT feed_url, subscribers FROM
 			 ttrss_feedbrowser_cache WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
 			WHERE tf.feed_url = ttrss_feedbrowser_cache.feed_url
 			AND owner_uid = '$owner_uid') $search_qpart
 			ORDER BY subscribers DESC LIMIT $limit"); */
 
-			$result = db_query($link, "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
+			$result = db_query( "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
 						(SELECT feed_url, site_url, title, subscribers FROM ttrss_feedbrowser_cache UNION ALL
 							SELECT feed_url, site_url, title, subscribers FROM ttrss_linked_feeds) AS qqq
 						WHERE
@@ -28,7 +28,7 @@
 						GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT $limit");
 
 		} else if ($mode == 2) {
-			$result = db_query($link, "SELECT *,
+			$result = db_query( "SELECT *,
 						(SELECT COUNT(*) FROM ttrss_user_entries WHERE
 					 		orig_feed_id = ttrss_archived_feeds.id) AS articles_archived
 						FROM
diff --git a/include/functions.php b/include/functions.php
index f0d5e85fa..971c61e2f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -166,13 +166,13 @@
 	 * @access public
 	 * @return void
 	 */
-	function purge_feed($link, $feed_id, $purge_interval, $debug = false) {
+	function purge_feed( $feed_id, $purge_interval, $debug = false) {
 
-		if (!$purge_interval) $purge_interval = feed_purge_interval($link, $feed_id);
+		if (!$purge_interval) $purge_interval = feed_purge_interval( $feed_id);
 
 		$rows = -1;
 
-		$result = db_query($link,
+		$result = db_query(
 			"SELECT owner_uid FROM ttrss_feeds WHERE id = '$feed_id'");
 
 		$owner_uid = false;
@@ -183,7 +183,7 @@
 
 		if ($purge_interval == -1 || !$purge_interval) {
 			if ($owner_uid) {
-				ccache_update($link, $feed_id, $owner_uid);
+				ccache_update( $feed_id, $owner_uid);
 			}
 			return;
 		}
@@ -191,7 +191,7 @@
 		if (!$owner_uid) return;
 
 		if (FORCE_ARTICLE_PURGE == 0) {
-			$purge_unread = get_pref($link, "PURGE_UNREAD_ARTICLES",
+			$purge_unread = get_pref( "PURGE_UNREAD_ARTICLES",
 				$owner_uid, false);
 		} else {
 			$purge_unread = true;
@@ -201,11 +201,11 @@
 		if (!$purge_unread) $query_limit = " unread = false AND ";
 
 		if (DB_TYPE == "pgsql") {
-			$pg_version = get_pgsql_version($link);
+			$pg_version = get_pgsql_version();
 
 			if (preg_match("/^7\./", $pg_version) || preg_match("/^8\.0/", $pg_version)) {
 
-				$result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
+				$result = db_query( "DELETE FROM ttrss_user_entries WHERE
 					ttrss_entries.id = ref_id AND
 					marked = false AND
 					feed_id = '$feed_id' AND
@@ -214,7 +214,7 @@
 
 			} else {
 
-				$result = db_query($link, "DELETE FROM ttrss_user_entries
+				$result = db_query( "DELETE FROM ttrss_user_entries
 					USING ttrss_entries
 					WHERE ttrss_entries.id = ref_id AND
 					marked = false AND
@@ -227,12 +227,12 @@
 
 		} else {
 
-/*			$result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
+/*			$result = db_query( "DELETE FROM ttrss_user_entries WHERE
 				marked = false AND feed_id = '$feed_id' AND
 				(SELECT date_updated FROM ttrss_entries WHERE
 					id = ref_id) < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */
 
-			$result = db_query($link, "DELETE FROM ttrss_user_entries
+			$result = db_query( "DELETE FROM ttrss_user_entries
 				USING ttrss_user_entries, ttrss_entries
 				WHERE ttrss_entries.id = ref_id AND
 				marked = false AND
@@ -240,11 +240,11 @@
 				$query_limit
 				ttrss_entries.date_updated < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)");
 
-			$rows = mysql_affected_rows($link);
+			$rows = mysql_affected_rows();
 
 		}
 
-		ccache_update($link, $feed_id, $owner_uid);
+		ccache_update( $feed_id, $owner_uid);
 
 		if ($debug) {
 			_debug("Purged feed $feed_id ($purge_interval): deleted $rows articles");
@@ -253,16 +253,16 @@
 		return $rows;
 	} // function purge_feed
 
-	function feed_purge_interval($link, $feed_id) {
+	function feed_purge_interval( $feed_id) {
 
-		$result = db_query($link, "SELECT purge_interval, owner_uid FROM ttrss_feeds
+		$result = db_query( "SELECT purge_interval, owner_uid FROM ttrss_feeds
 			WHERE id = '$feed_id'");
 
 		if (db_num_rows($result) == 1) {
 			$purge_interval = db_fetch_result($result, 0, "purge_interval");
 			$owner_uid = db_fetch_result($result, 0, "owner_uid");
 
-			if ($purge_interval == 0) $purge_interval = get_pref($link,
+			if ($purge_interval == 0) $purge_interval = get_pref(
 				'PURGE_OLD_DAYS', $owner_uid);
 
 			return $purge_interval;
@@ -272,20 +272,20 @@
 		}
 	}
 
-	function purge_orphans($link, $do_output = false) {
+	function purge_orphans( $do_output = false) {
 
 		// purge orphaned posts in main content table
-		$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");
 
 		if ($do_output) {
-			$rows = db_affected_rows($link, $result);
+			$rows = db_affected_rows( $result);
 			_debug("Purged $rows orphaned posts.");
 		}
 	}
 
-	function get_feed_update_interval($link, $feed_id) {
-		$result = db_query($link, "SELECT owner_uid, update_interval FROM
+	function get_feed_update_interval( $feed_id) {
+		$result = db_query( "SELECT owner_uid, update_interval FROM
 			ttrss_feeds WHERE id = '$feed_id'");
 
 		if (db_num_rows($result) == 1) {
@@ -295,7 +295,7 @@
 			if ($update_interval != 0) {
 				return $update_interval;
 			} else {
-				return get_pref($link, 'DEFAULT_UPDATE_INTERVAL', $owner_uid, false);
+				return get_pref( 'DEFAULT_UPDATE_INTERVAL', $owner_uid, false);
 			}
 
 		} else {
@@ -450,7 +450,7 @@
 		return $favicon_url;
 	} // function get_favicon_url
 
-	function check_feed_favicon($site_url, $feed, $link) {
+	function check_feed_favicon($site_url, $feed) {
 #		print "FAVICON [$site_url]: $favicon_url\n";
 
 		$icon_file = ICONS_DIR . "/$feed.ico";
@@ -552,9 +552,9 @@
 		}
 	}
 
-	function initialize_user_prefs($link, $uid, $profile = false) {
+	function initialize_user_prefs( $uid, $profile = false) {
 
-		$uid = db_escape_string($link, $uid);
+		$uid = db_escape_string( $uid);
 
 		if (!$profile) {
 			$profile = "NULL";
@@ -563,13 +563,13 @@
 			$profile_qpart = "AND profile = '$profile'";
 		}
 
-		if (get_schema_version($link) < 63) $profile_qpart = "";
+		if (get_schema_version() < 63) $profile_qpart = "";
 
-		db_query($link, "BEGIN");
+		db_query( "BEGIN");
 
-		$result = db_query($link, "SELECT pref_name,def_value FROM ttrss_prefs");
+		$result = db_query( "SELECT pref_name,def_value FROM ttrss_prefs");
 
-		$u_result = db_query($link, "SELECT pref_name
+		$u_result = db_query( "SELECT pref_name
 			FROM ttrss_user_prefs WHERE owner_uid = '$uid' $profile_qpart");
 
 		$active_prefs = array();
@@ -582,16 +582,16 @@
 			if (array_search($line["pref_name"], $active_prefs) === FALSE) {
 //				print "adding " . $line["pref_name"] . "<br>";
 
-				$line["def_value"] = db_escape_string($link, $line["def_value"]);
-				$line["pref_name"] = db_escape_string($link, $line["pref_name"]);
+				$line["def_value"] = db_escape_string( $line["def_value"]);
+				$line["pref_name"] = db_escape_string( $line["pref_name"]);
 
-				if (get_schema_version($link) < 63) {
-					db_query($link, "INSERT INTO ttrss_user_prefs
+				if (get_schema_version() < 63) {
+					db_query( "INSERT INTO ttrss_user_prefs
 						(owner_uid,pref_name,value) VALUES
 						('$uid', '".$line["pref_name"]."','".$line["def_value"]."')");
 
 				} else {
-					db_query($link, "INSERT INTO ttrss_user_prefs
+					db_query( "INSERT INTO ttrss_user_prefs
 						(owner_uid,pref_name,value, profile) VALUES
 						('$uid', '".$line["pref_name"]."','".$line["def_value"]."', $profile)");
 				}
@@ -599,7 +599,7 @@
 			}
 		}
 
-		db_query($link, "COMMIT");
+		db_query( "COMMIT");
 
 	}
 
@@ -613,7 +613,7 @@
 		return "";
 	}
 
-	function authenticate_user($link, $login, $password, $check_only = false) {
+	function authenticate_user( $login, $password, $check_only = false) {
 
 		if (!SINGLE_USER_MODE) {
 			$user_id = false;
@@ -635,14 +635,14 @@
 				$_SESSION["uid"] = $user_id;
 				$_SESSION["version"] = VERSION;
 
-				$result = db_query($link, "SELECT login,access_level,pwd_hash FROM ttrss_users
+				$result = db_query( "SELECT login,access_level,pwd_hash FROM ttrss_users
 					WHERE id = '$user_id'");
 
 				$_SESSION["name"] = db_fetch_result($result, 0, "login");
 				$_SESSION["access_level"] = db_fetch_result($result, 0, "access_level");
 				$_SESSION["csrf_token"] = sha1(uniqid(rand(), true));
 
-				db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
+				db_query( "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
 					$_SESSION["uid"]);
 
 				$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
@@ -651,7 +651,7 @@
 
 				$_SESSION["last_version_check"] = time();
 
-				initialize_user_prefs($link, $_SESSION["uid"]);
+				initialize_user_prefs( $_SESSION["uid"]);
 
 				return true;
 			}
@@ -675,7 +675,7 @@
 
 			$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
 
-			initialize_user_prefs($link, $_SESSION["uid"]);
+			initialize_user_prefs( $_SESSION["uid"]);
 
 			return true;
 		}
@@ -704,13 +704,13 @@
 
 	// user preferences are checked on every login, not here
 
-	function initialize_user($link, $uid) {
+	function initialize_user( $uid) {
 
-		db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
+		db_query( "insert into ttrss_feeds (owner_uid,title,feed_url)
 			values ('$uid', 'Tiny Tiny RSS: New Releases',
 			'http://tt-rss.org/releases.rss')");
 
-		db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
+		db_query( "insert into ttrss_feeds (owner_uid,title,feed_url)
 			values ('$uid', 'Tiny Tiny RSS: Forum',
 				'http://tt-rss.org/forum/rss.php')");
 	}
@@ -726,49 +726,49 @@
 		return $csrf_token == $_SESSION['csrf_token'];
 	}
 
-	function load_user_plugins($link, $owner_uid) {
+	function load_user_plugins( $owner_uid) {
 		if ($owner_uid) {
-			$plugins = get_pref($link, "_ENABLED_PLUGINS", $owner_uid);
+			$plugins = get_pref( "_ENABLED_PLUGINS", $owner_uid);
 
 			global $pluginhost;
 			$pluginhost->load($plugins, $pluginhost::KIND_USER, $owner_uid);
 
-			if (get_schema_version($link) > 100) {
+			if (get_schema_version() > 100) {
 				$pluginhost->load_data();
 			}
 		}
 	}
 
-	function login_sequence($link) {
+	function login_sequence() {
 		$_SESSION["prefs_cache"] = false;
 
 		if (SINGLE_USER_MODE) {
 			@session_start();
-			authenticate_user($link, "admin", null);
-			cache_prefs($link);
-			load_user_plugins($link, $_SESSION["uid"]);
+			authenticate_user( "admin", null);
+			cache_prefs();
+			load_user_plugins( $_SESSION["uid"]);
 		} else {
-			if (!validate_session($link)) $_SESSION["uid"] = false;
+			if (!validate_session()) $_SESSION["uid"] = false;
 
 			if (!$_SESSION["uid"]) {
 
-				if (AUTH_AUTO_LOGIN && authenticate_user($link, null, null)) {
-				    $_SESSION["ref_schema_version"] = get_schema_version($link, true);
+				if (AUTH_AUTO_LOGIN && authenticate_user( null, null)) {
+				    $_SESSION["ref_schema_version"] = get_schema_version( true);
 				} else {
-					 authenticate_user($link, null, null, true);
+					 authenticate_user( null, null, true);
 				}
 
 				if (!$_SESSION["uid"]) {
 					@session_destroy();
 					setcookie(session_name(), '', time()-42000, '/');
 
-					render_login_form($link);
+					render_login_form();
 					exit;
 				}
 
 			} else {
 				/* bump login timestamp */
-				db_query($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();
 			}
@@ -779,17 +779,17 @@
 			}
 
 			if ($_SESSION["uid"]) {
-				cache_prefs($link);
-				load_user_plugins($link, $_SESSION["uid"]);
+				cache_prefs();
+				load_user_plugins( $_SESSION["uid"]);
 
 				/* cleanup ccache */
 
-				db_query($link, "DELETE FROM ttrss_counters_cache WHERE owner_uid = ".
+				db_query( "DELETE FROM ttrss_counters_cache WHERE owner_uid = ".
 					$_SESSION["uid"] . " AND
 						(SELECT COUNT(id) FROM ttrss_feeds WHERE
 							ttrss_feeds.id = feed_id) = 0");
 
-				db_query($link, "DELETE FROM ttrss_cat_counters_cache WHERE owner_uid = ".
+				db_query( "DELETE FROM ttrss_cat_counters_cache WHERE owner_uid = ".
 					$_SESSION["uid"] . " AND
 						(SELECT COUNT(id) FROM ttrss_feed_categories WHERE
 							ttrss_feed_categories.id = feed_id) = 0");
@@ -825,7 +825,7 @@
 		return $dt->format('U') + $dest_tz->getOffset($dt);
 	}
 
-	function make_local_datetime($link, $timestamp, $long, $owner_uid = false,
+	function make_local_datetime( $timestamp, $long, $owner_uid = false,
 					$no_smart_dt = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
@@ -839,7 +839,7 @@
 
 		if ($tz_offset == -1) {
 
-			$user_tz_string = get_pref($link, 'USER_TIMEZONE', $owner_uid);
+			$user_tz_string = get_pref( 'USER_TIMEZONE', $owner_uid);
 
 			try {
 				$user_tz = new DateTimeZone($user_tz_string);
@@ -853,28 +853,28 @@
 		$user_timestamp = $dt->format('U') + $tz_offset;
 
 		if (!$no_smart_dt) {
-			return smart_date_time($link, $user_timestamp,
+			return smart_date_time( $user_timestamp,
 				$tz_offset, $owner_uid);
 		} else {
 			if ($long)
-				$format = get_pref($link, 'LONG_DATE_FORMAT', $owner_uid);
+				$format = get_pref( 'LONG_DATE_FORMAT', $owner_uid);
 			else
-				$format = get_pref($link, 'SHORT_DATE_FORMAT', $owner_uid);
+				$format = get_pref( 'SHORT_DATE_FORMAT', $owner_uid);
 
 			return date($format, $user_timestamp);
 		}
 	}
 
-	function smart_date_time($link, $timestamp, $tz_offset = 0, $owner_uid = false) {
+	function smart_date_time( $timestamp, $tz_offset = 0, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
 		if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
 			return date("G:i", $timestamp);
 		} else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) {
-			$format = get_pref($link, 'SHORT_DATE_FORMAT', $owner_uid);
+			$format = get_pref( 'SHORT_DATE_FORMAT', $owner_uid);
 			return date($format, $timestamp);
 		} else {
-			$format = get_pref($link, 'LONG_DATE_FORMAT', $owner_uid);
+			$format = get_pref( 'LONG_DATE_FORMAT', $owner_uid);
 			return date($format, $timestamp);
 		}
 	}
@@ -898,11 +898,11 @@
 	// Session caching removed due to causing wrong redirects to upgrade
 	// script when get_schema_version() is called on an obsolete session
 	// created on a previous schema version.
-	function get_schema_version($link, $nocache = false) {
+	function get_schema_version( $nocache = false) {
 		global $schema_version;
 
 		if (!$schema_version) {
-			$result = db_query($link, "SELECT schema_version FROM ttrss_version");
+			$result = db_query( "SELECT schema_version FROM ttrss_version");
 			$version = db_fetch_result($result, 0, "schema_version");
 			$schema_version = $version;
 			return $version;
@@ -911,24 +911,24 @@
 		}
 	}
 
-	function sanity_check($link) {
+	function sanity_check() {
 		require_once 'errors.php';
 
 		$error_code = 0;
-		$schema_version = get_schema_version($link, true);
+		$schema_version = get_schema_version( true);
 
 		if ($schema_version != SCHEMA_VERSION) {
 			$error_code = 5;
 		}
 
 		if (DB_TYPE == "mysql") {
-			$result = db_query($link, "SELECT true", false);
+			$result = db_query( "SELECT true", false);
 			if (db_num_rows($result) != 1) {
 				$error_code = 10;
 			}
 		}
 
-		if (db_escape_string($link, "testTEST") != "testTEST") {
+		if (db_escape_string( "testTEST") != "testTEST") {
 			$error_code = 12;
 		}
 
@@ -987,7 +987,7 @@
 		}
 	}
 
-	function catchup_feed($link, $feed, $cat_view, $owner_uid = false, $max_id = false, $mode = 'all') {
+	function catchup_feed( $feed, $cat_view, $owner_uid = false, $max_id = false, $mode = 'all') {
 
 			if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
@@ -1029,7 +1029,7 @@
 					if ($feed >= 0) {
 
 						if ($feed > 0) {
-							$children = getChildCategories($link, $feed, $owner_uid);
+							$children = getChildCategories( $feed, $owner_uid);
 							array_push($children, $feed);
 
 							$children = join(",", $children);
@@ -1039,7 +1039,7 @@
 							$cat_qpart = "cat_id IS NULL";
 						}
 
-						db_query($link, "UPDATE ttrss_user_entries
+						db_query( "UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1048,7 +1048,7 @@
 
 					} else if ($feed == -2) {
 
-						db_query($link, "UPDATE ttrss_user_entries
+						db_query( "UPDATE ttrss_user_entries
 							SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
 								FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0
 								AND unread = true AND $date_qpart AND owner_uid = $owner_uid");
@@ -1056,7 +1056,7 @@
 
 				} else if ($feed > 0) {
 
-					db_query($link, "UPDATE ttrss_user_entries
+					db_query( "UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
 								(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1065,7 +1065,7 @@
 				} else if ($feed < 0 && $feed > LABEL_BASE_INDEX) { // special, like starred
 
 					if ($feed == -1) {
-						db_query($link, "UPDATE ttrss_user_entries
+						db_query( "UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1073,7 +1073,7 @@
 					}
 
 					if ($feed == -2) {
-						db_query($link, "UPDATE ttrss_user_entries
+						db_query( "UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1082,7 +1082,7 @@
 
 					if ($feed == -3) {
 
-						$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
+						$intl = get_pref( "FRESH_ARTICLE_MAX_AGE");
 
 						if (DB_TYPE == "pgsql") {
 							$match_part = "date_entered > NOW() - INTERVAL '$intl hour' ";
@@ -1091,7 +1091,7 @@
 								INTERVAL $intl HOUR) ";
 						}
 
-						db_query($link, "UPDATE ttrss_user_entries
+						db_query( "UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1099,7 +1099,7 @@
 					}
 
 					if ($feed == -4) {
-						db_query($link, "UPDATE ttrss_user_entries
+						db_query( "UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1110,7 +1110,7 @@
 
 					$label_id = feed_to_label_id($feed);
 
-					db_query($link, "UPDATE ttrss_user_entries
+					db_query( "UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
 								(SELECT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_user_labels2 WHERE ref_id = id
@@ -1119,10 +1119,10 @@
 
 				}
 
-				ccache_update($link, $feed, $owner_uid, $cat_view);
+				ccache_update( $feed, $owner_uid, $cat_view);
 
 			} else { // tag
-				db_query($link, "UPDATE ttrss_user_entries
+				db_query( "UPDATE ttrss_user_entries
 					SET unread = false, last_read = NOW() WHERE ref_id IN
 						(SELECT id FROM
 							(SELECT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_tags WHERE ref_id = ttrss_entries.id
@@ -1132,18 +1132,18 @@
 			}
 	}
 
-	function getAllCounters($link) {
-		$data = getGlobalCounters($link);
+	function getAllCounters() {
+		$data = getGlobalCounters();
 
-		$data = array_merge($data, getVirtCounters($link));
-		$data = array_merge($data, getLabelCounters($link));
-		$data = array_merge($data, getFeedCounters($link, $active_feed));
-		$data = array_merge($data, getCategoryCounters($link));
+		$data = array_merge($data, getVirtCounters());
+		$data = array_merge($data, getLabelCounters());
+		$data = array_merge($data, getFeedCounters( $active_feed));
+		$data = array_merge($data, getCategoryCounters());
 
 		return $data;
 	}
 
-	function getCategoryTitle($link, $cat_id) {
+	function getCategoryTitle( $cat_id) {
 
 		if ($cat_id == -1) {
 			return __("Special");
@@ -1151,7 +1151,7 @@
 			return __("Labels");
 		} else {
 
-			$result = db_query($link, "SELECT title FROM ttrss_feed_categories WHERE
+			$result = db_query( "SELECT title FROM ttrss_feed_categories WHERE
 				id = '$cat_id'");
 
 			if (db_num_rows($result) == 1) {
@@ -1163,17 +1163,17 @@
 	}
 
 
-	function getCategoryCounters($link) {
+	function getCategoryCounters() {
 		$ret_arr = array();
 
 		/* Labels category */
 
 		$cv = array("id" => -2, "kind" => "cat",
-			"counter" => getCategoryUnread($link, -2));
+			"counter" => getCategoryUnread( -2));
 
 		array_push($ret_arr, $cv);
 
-		$result = db_query($link, "SELECT id AS cat_id, value AS unread,
+		$result = db_query( "SELECT id AS cat_id, value AS unread,
 			(SELECT COUNT(id) FROM ttrss_feed_categories AS c2
 				WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children
 			FROM ttrss_feed_categories, ttrss_cat_counters_cache
@@ -1185,7 +1185,7 @@
 			$line["cat_id"] = (int) $line["cat_id"];
 
 			if ($line["num_children"] > 0) {
-				$child_counter = getCategoryChildrenUnread($link, $line["cat_id"], $_SESSION["uid"]);
+				$child_counter = getCategoryChildrenUnread( $line["cat_id"], $_SESSION["uid"]);
 			} else {
 				$child_counter = 0;
 			}
@@ -1199,7 +1199,7 @@
 		/* Special case: NULL category doesn't actually exist in the DB */
 
 		$cv = array("id" => 0, "kind" => "cat",
-			"counter" => (int) ccache_find($link, 0, $_SESSION["uid"], true));
+			"counter" => (int) ccache_find( 0, $_SESSION["uid"], true));
 
 		array_push($ret_arr, $cv);
 
@@ -1207,23 +1207,23 @@
 	}
 
 	// only accepts real cats (>= 0)
-	function getCategoryChildrenUnread($link, $cat, $owner_uid = false) {
+	function getCategoryChildrenUnread( $cat, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$result = db_query($link, "SELECT id FROM ttrss_feed_categories WHERE parent_cat = '$cat'
+		$result = db_query( "SELECT id FROM ttrss_feed_categories WHERE parent_cat = '$cat'
 				AND owner_uid = $owner_uid");
 
 		$unread = 0;
 
 		while ($line = db_fetch_assoc($result)) {
-			$unread += getCategoryUnread($link, $line["id"], $owner_uid);
-			$unread += getCategoryChildrenUnread($link, $line["id"], $owner_uid);
+			$unread += getCategoryUnread( $line["id"], $owner_uid);
+			$unread += getCategoryChildrenUnread( $line["id"], $owner_uid);
 		}
 
 		return $unread;
 	}
 
-	function getCategoryUnread($link, $cat, $owner_uid = false) {
+	function getCategoryUnread( $cat, $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -1235,7 +1235,7 @@
 				$cat_query = "cat_id IS NULL";
 			}
 
-			$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE $cat_query
+			$result = db_query( "SELECT id FROM ttrss_feeds WHERE $cat_query
 					AND owner_uid = " . $owner_uid);
 
 			$cat_feeds = array();
@@ -1247,7 +1247,7 @@
 
 			$match_part = implode(" OR ", $cat_feeds);
 
-			$result = db_query($link, "SELECT COUNT(int_id) AS unread
+			$result = db_query( "SELECT COUNT(int_id) AS unread
 				FROM ttrss_user_entries
 				WHERE	unread = true AND ($match_part)
 				AND owner_uid = " . $owner_uid);
@@ -1261,10 +1261,10 @@
 
 			return $unread;
 		} else if ($cat == -1) {
-			return getFeedUnread($link, -1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0);
+			return getFeedUnread( -1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0);
 		} else if ($cat == -2) {
 
-			$result = db_query($link, "
+			$result = db_query( "
 				SELECT COUNT(unread) AS unread FROM
 					ttrss_user_entries, ttrss_user_labels2
 				WHERE article_id = ref_id AND unread = true
@@ -1277,14 +1277,14 @@
 		}
 	}
 
-	function getFeedUnread($link, $feed, $is_cat = false) {
-		return getFeedArticles($link, $feed, $is_cat, true, $_SESSION["uid"]);
+	function getFeedUnread( $feed, $is_cat = false) {
+		return getFeedArticles( $feed, $is_cat, true, $_SESSION["uid"]);
 	}
 
-	function getLabelUnread($link, $label_id, $owner_uid = false) {
+	function getLabelUnread( $label_id, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$result = db_query($link, "SELECT COUNT(ref_id) AS unread FROM ttrss_user_entries, ttrss_user_labels2
+		$result = db_query( "SELECT COUNT(ref_id) AS unread FROM ttrss_user_entries, ttrss_user_labels2
 			WHERE owner_uid = '$owner_uid' AND unread = true AND label_id = '$label_id' AND article_id = ref_id");
 
 		if (db_num_rows($result) != 0) {
@@ -1294,7 +1294,7 @@
 		}
 	}
 
-	function getFeedArticles($link, $feed, $is_cat = false, $unread_only = false,
+	function getFeedArticles( $feed, $is_cat = false, $unread_only = false,
 		$owner_uid = false) {
 
 		$n_feed = (int) $feed;
@@ -1309,14 +1309,14 @@
 		}
 
 		if ($is_cat) {
-			return getCategoryUnread($link, $n_feed, $owner_uid);
+			return getCategoryUnread( $n_feed, $owner_uid);
 		} else if ($n_feed == -6) {
 			return 0;
 		} else if ($feed != "0" && $n_feed == 0) {
 
-			$feed = db_escape_string($link, $feed);
+			$feed = db_escape_string( $feed);
 
-			$result = db_query($link, "SELECT SUM((SELECT COUNT(int_id)
+			$result = db_query( "SELECT SUM((SELECT COUNT(int_id)
 				FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
 					AND ref_id = id AND $unread_qpart)) AS count FROM ttrss_tags
 				WHERE owner_uid = $owner_uid AND tag_name = '$feed'");
@@ -1329,7 +1329,7 @@
 		} else if ($n_feed == -3) {
 			$match_part = "unread = true AND score >= 0";
 
-			$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
+			$intl = get_pref( "FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
 			if (DB_TYPE == "pgsql") {
 				$match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
@@ -1353,7 +1353,7 @@
 
 			$label_id = feed_to_label_id($feed);
 
-			return getLabelUnread($link, $label_id, $owner_uid);
+			return getLabelUnread( $label_id, $owner_uid);
 
 		}
 
@@ -1372,11 +1372,11 @@
 
 			//echo "[$feed/$query]\n";
 
-			$result = db_query($link, $query);
+			$result = db_query( $query);
 
 		} else {
 
-			$result = db_query($link, "SELECT COUNT(post_int_id) AS unread
+			$result = db_query( "SELECT COUNT(post_int_id) AS unread
 				FROM ttrss_tags,ttrss_user_entries,ttrss_entries
 				WHERE tag_name = '$feed' AND post_int_id = int_id AND ref_id = ttrss_entries.id
 				AND $unread_qpart AND ttrss_tags.owner_uid = " . $owner_uid);
@@ -1387,13 +1387,13 @@
 		return $unread;
 	}
 
-	function getGlobalUnread($link, $user_id = false) {
+	function getGlobalUnread( $user_id = false) {
 
 		if (!$user_id) {
 			$user_id = $_SESSION["uid"];
 		}
 
-		$result = db_query($link, "SELECT SUM(value) AS c_id FROM ttrss_counters_cache
+		$result = db_query( "SELECT SUM(value) AS c_id FROM ttrss_counters_cache
 			WHERE owner_uid = '$user_id' AND feed_id > 0");
 
 		$c_id = db_fetch_result($result, 0, "c_id");
@@ -1401,11 +1401,11 @@
 		return $c_id;
 	}
 
-	function getGlobalCounters($link, $global_unread = -1) {
+	function getGlobalCounters( $global_unread = -1) {
 		$ret_arr = array();
 
 		if ($global_unread == -1) {
-			$global_unread = getGlobalUnread($link);
+			$global_unread = getGlobalUnread();
 		}
 
 		$cv = array("id" => "global-unread",
@@ -1413,7 +1413,7 @@
 
 		array_push($ret_arr, $cv);
 
-		$result = db_query($link, "SELECT COUNT(id) AS fn FROM
+		$result = db_query( "SELECT COUNT(id) AS fn FROM
 			ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
 		$subscribed_feeds = db_fetch_result($result, 0, "fn");
@@ -1426,19 +1426,19 @@
 		return $ret_arr;
 	}
 
-	function getVirtCounters($link) {
+	function getVirtCounters() {
 
 		$ret_arr = array();
 
 		for ($i = 0; $i >= -4; $i--) {
 
-			$count = getFeedUnread($link, $i);
+			$count = getFeedUnread( $i);
 
 			$cv = array("id" => $i,
 				"counter" => (int) $count);
 
-//			if (get_pref($link, 'EXTENDED_FEEDLIST'))
-//				$cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
+//			if (get_pref( 'EXTENDED_FEEDLIST'))
+//				$cv["xmsg"] = getFeedArticles( $i)." ".__("total");
 
 			array_push($ret_arr, $cv);
 		}
@@ -1461,13 +1461,13 @@
 		return $ret_arr;
 	}
 
-	function getLabelCounters($link, $descriptions = false) {
+	function getLabelCounters( $descriptions = false) {
 
 		$ret_arr = array();
 
 		$owner_uid = $_SESSION["uid"];
 
-		$result = db_query($link, "SELECT id,caption,COUNT(unread) AS unread
+		$result = db_query( "SELECT id,caption,COUNT(unread) AS unread
 			FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
 				(ttrss_labels2.id = label_id)
 				LEFT JOIN ttrss_user_entries ON (ref_id = article_id AND unread = true
@@ -1488,8 +1488,8 @@
 			if ($descriptions)
 				$cv["description"] = $label_name;
 
-//			if (get_pref($link, 'EXTENDED_FEEDLIST'))
-//				$cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
+//			if (get_pref( 'EXTENDED_FEEDLIST'))
+//				$cv["xmsg"] = getFeedArticles( $id)." ".__("total");
 
 			array_push($ret_arr, $cv);
 		}
@@ -1497,7 +1497,7 @@
 		return $ret_arr;
 	}
 
-	function getFeedCounters($link, $active_feed = false) {
+	function getFeedCounters( $active_feed = false) {
 
 		$ret_arr = array();
 
@@ -1510,7 +1510,7 @@
 				AND ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid
 				AND ttrss_counters_cache.feed_id = id";
 
-		$result = db_query($link, $query);
+		$result = db_query( $query);
 		$fctrs_modified = false;
 
 		while ($line = db_fetch_assoc($result)) {
@@ -1519,7 +1519,7 @@
 			$count = $line["count"];
 			$last_error = htmlspecialchars($line["last_error"]);
 
-			$last_updated = make_local_datetime($link, $line['last_updated'], false);
+			$last_updated = make_local_datetime( $line['last_updated'], false);
 
 			$has_img = feed_has_icon($id);
 
@@ -1534,8 +1534,8 @@
 			if ($last_error)
 				$cv["error"] = $last_error;
 
-//			if (get_pref($link, 'EXTENDED_FEEDLIST'))
-//				$cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
+//			if (get_pref( 'EXTENDED_FEEDLIST'))
+//				$cv["xmsg"] = getFeedArticles( $id)." ".__("total");
 
 			if ($active_feed && $id == $active_feed)
 				$cv["title"] = truncate_string($line["title"], 30);
@@ -1547,8 +1547,8 @@
 		return $ret_arr;
 	}
 
-	function get_pgsql_version($link) {
-		$result = db_query($link, "SELECT version() AS version");
+	function get_pgsql_version() {
+		$result = db_query( "SELECT version() AS version");
 		$version = explode(" ", db_fetch_result($result, 0, "version"));
 		return $version[1];
 	}
@@ -1565,7 +1565,7 @@
 	 *                     to get all possible feeds.
 	 *                 5 - Couldn't download the URL content.
 	 */
-	function subscribe_to_feed($link, $url, $cat_id = 0,
+	function subscribe_to_feed( $url, $cat_id = 0,
 			$auth_login = '', $auth_pass = '') {
 
 		global $fetch_last_error;
@@ -1600,7 +1600,7 @@
 			$cat_qpart = "'$cat_id'";
 		}
 
-		$result = db_query($link,
+		$result = db_query(
 			"SELECT id FROM ttrss_feeds
 			WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]);
 
@@ -1612,23 +1612,23 @@
 			$auth_pass_encrypted = 'false';
 		}
 
-		$auth_pass = db_escape_string($link, $auth_pass);
+		$auth_pass = db_escape_string( $auth_pass);
 
 		if (db_num_rows($result) == 0) {
-			$result = db_query($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"]."', '$url',
 				'[Unknown]', $cat_qpart, '$auth_login', '$auth_pass', 0, $auth_pass_encrypted)");
 
-			$result = db_query($link,
+			$result = db_query(
 				"SELECT id FROM ttrss_feeds WHERE feed_url = '$url'
 					AND owner_uid = " . $_SESSION["uid"]);
 
 			$feed_id = db_fetch_result($result, 0, "id");
 
 			if ($feed_id) {
-				update_rss_feed($link, $feed_id, true);
+				update_rss_feed( $feed_id, true);
 			}
 
 			return array("code" => 1);
@@ -1637,7 +1637,7 @@
 		}
 	}
 
-	function print_feed_select($link, $id, $default_id = "",
+	function print_feed_select( $id, $default_id = "",
 		$attributes = "", $include_all_feeds = true,
 	  	$root_id = false, $nest_level = 0) {
 
@@ -1649,14 +1649,14 @@
 			}
 		}
 
-		if (get_pref($link, 'ENABLE_FEED_CATS')) {
+		if (get_pref( 'ENABLE_FEED_CATS')) {
 
 			if ($root_id)
 				$parent_qpart = "parent_cat = '$root_id'";
 			else
 				$parent_qpart = "parent_cat IS NULL";
 
-			$result = db_query($link, "SELECT id,title,
+			$result = db_query( "SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
 					c2.parent_cat = ttrss_feed_categories.id) AS num_children
 				FROM ttrss_feed_categories
@@ -1673,10 +1673,10 @@
 					$line["id"], htmlspecialchars($line["title"]));
 
 				if ($line["num_children"] > 0)
-					print_feed_select($link, $id, $default_id, $attributes,
+					print_feed_select( $id, $default_id, $attributes,
 						$include_all_feeds, $line["id"], $nest_level+1);
 
-				$feed_result = db_query($link, "SELECT id,title FROM ttrss_feeds
+				$feed_result = db_query( "SELECT id,title FROM ttrss_feeds
 					WHERE cat_id = '".$line["id"]."' AND owner_uid = ".$_SESSION["uid"] . " ORDER BY title");
 
 				while ($fline = db_fetch_assoc($feed_result)) {
@@ -1698,7 +1698,7 @@
 				printf("<option $is_selected value='CAT:0'>%s</option>",
 					__("Uncategorized"));
 
-				$feed_result = db_query($link, "SELECT id,title FROM ttrss_feeds
+				$feed_result = db_query( "SELECT id,title FROM ttrss_feeds
 					WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"] . " ORDER BY title");
 
 				while ($fline = db_fetch_assoc($feed_result)) {
@@ -1715,7 +1715,7 @@
 			}
 
 		} else {
-			$result = db_query($link, "SELECT id,title FROM ttrss_feeds
+			$result = db_query( "SELECT id,title FROM ttrss_feeds
 				WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
 			while ($line = db_fetch_assoc($result)) {
@@ -1732,7 +1732,7 @@
 		}
 	}
 
-	function print_feed_cat_select($link, $id, $default_id,
+	function print_feed_cat_select( $id, $default_id,
 		$attributes, $include_all_cats = true, $root_id = false, $nest_level = 0) {
 
 			if (!$root_id) {
@@ -1744,7 +1744,7 @@
 			else
 				$parent_qpart = "parent_cat IS NULL";
 
-			$result = db_query($link, "SELECT id,title,
+			$result = db_query( "SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
 					c2.parent_cat = ttrss_feed_categories.id) AS num_children
 				FROM ttrss_feed_categories
@@ -1765,7 +1765,7 @@
 						$line["id"], htmlspecialchars($line["title"]));
 
 				if ($line["num_children"] > 0)
-					print_feed_cat_select($link, $id, $default_id, $attributes,
+					print_feed_cat_select( $id, $default_id, $attributes,
 						$include_all_cats, $line["id"], $nest_level+1);
 			}
 
@@ -1791,13 +1791,13 @@
 		return ($val == "on") ? "true" : "false";
 	}
 
-	function getFeedCatTitle($link, $id) {
+	function getFeedCatTitle( $id) {
 		if ($id == -1) {
 			return __("Special");
 		} else if ($id < LABEL_BASE_INDEX) {
 			return __("Labels");
 		} else if ($id > 0) {
-			$result = db_query($link, "SELECT ttrss_feed_categories.title
+			$result = db_query( "SELECT ttrss_feed_categories.title
 				FROM ttrss_feeds, ttrss_feed_categories WHERE ttrss_feeds.id = '$id' AND
 					cat_id = ttrss_feed_categories.id");
 			if (db_num_rows($result) == 1) {
@@ -1844,9 +1844,9 @@
 		return false;
 	}
 
-	function getFeedTitle($link, $id, $cat = false) {
+	function getFeedTitle( $id, $cat = false) {
 		if ($cat) {
-			return getCategoryTitle($link, $id);
+			return getCategoryTitle( $id);
 		} else if ($id == -1) {
 			return __("Starred articles");
 		} else if ($id == -2) {
@@ -1861,7 +1861,7 @@
 			return __("Recently read");
 		} else if ($id < LABEL_BASE_INDEX) {
 			$label_id = feed_to_label_id($id);
-			$result = db_query($link, "SELECT caption FROM ttrss_labels2 WHERE id = '$label_id'");
+			$result = db_query( "SELECT caption FROM ttrss_labels2 WHERE id = '$label_id'");
 			if (db_num_rows($result) == 1) {
 				return db_fetch_result($result, 0, "caption");
 			} else {
@@ -1869,7 +1869,7 @@
 			}
 
 		} else if (is_numeric($id) && $id > 0) {
-			$result = db_query($link, "SELECT title FROM ttrss_feeds WHERE id = '$id'");
+			$result = db_query( "SELECT title FROM ttrss_feeds WHERE id = '$id'");
 			if (db_num_rows($result) == 1) {
 				return db_fetch_result($result, 0, "title");
 			} else {
@@ -1880,7 +1880,7 @@
 		}
 	}
 
-	function make_init_params($link) {
+	function make_init_params() {
 		$params = array();
 
 		foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
@@ -1888,18 +1888,18 @@
 			"CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
 			"HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
 
-				 $params[strtolower($param)] = (int) get_pref($link, $param);
+				 $params[strtolower($param)] = (int) get_pref( $param);
 		 }
 
 		$params["icons_url"] = ICONS_URL;
 		$params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME;
-		$params["default_view_mode"] = get_pref($link, "_DEFAULT_VIEW_MODE");
-		$params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT");
-		$params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY");
+		$params["default_view_mode"] = get_pref( "_DEFAULT_VIEW_MODE");
+		$params["default_view_limit"] = (int) get_pref( "_DEFAULT_VIEW_LIMIT");
+		$params["default_view_order_by"] = get_pref( "_DEFAULT_VIEW_ORDER_BY");
 		$params["bw_limit"] = (int) $_SESSION["bw_limit"];
 		$params["label_base_index"] = (int) LABEL_BASE_INDEX;
 
-		$result = db_query($link, "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
+		$result = db_query( "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
 			ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
 		$max_feed_id = db_fetch_result($result, 0, "mid");
@@ -1908,8 +1908,8 @@
 		$params["max_feed_id"] = (int) $max_feed_id;
 		$params["num_feeds"] = (int) $num_feeds;
 
-		$params["collapsed_feedlist"] = (int) get_pref($link, "_COLLAPSED_FEEDLIST");
-		$params["hotkeys"] = get_hotkeys_map($link);
+		$params["collapsed_feedlist"] = (int) get_pref( "_COLLAPSED_FEEDLIST");
+		$params["hotkeys"] = get_hotkeys_map();
 
 		$params["csrf_token"] = $_SESSION["csrf_token"];
 		$params["widescreen"] = (int) $_COOKIE["ttrss_widescreen"];
@@ -1919,7 +1919,7 @@
 		return $params;
 	}
 
-	function get_hotkeys_info($link) {
+	function get_hotkeys_info() {
 		$hotkeys = array(
 			__("Navigation") => array(
 				"next_feed" => __("Open next feed"),
@@ -1990,7 +1990,7 @@
 		return $hotkeys;
 	}
 
-	function get_hotkeys_map($link) {
+	function get_hotkeys_map() {
 		$hotkeys = array(
 //			"navigation" => array(
 				"k" => "next_feed",
@@ -2054,7 +2054,7 @@
 				"^(191)|Ctrl+/" => "help_dialog",
 			);
 
-		if (get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+		if (get_pref( 'COMBINED_DISPLAY_MODE')) {
 			$hotkeys["^(38)|Ctrl-up"] = "prev_article_noscroll";
 			$hotkeys["^(40)|Ctrl-down"] = "next_article_noscroll";
 		}
@@ -2077,10 +2077,10 @@
 		return array($prefixes, $hotkeys);
 	}
 
-	function make_runtime_info($link) {
+	function make_runtime_info() {
 		$data = array();
 
-		$result = db_query($link, "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
+		$result = db_query( "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
 			ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
 		$max_feed_id = db_fetch_result($result, 0, "mid");
@@ -2089,8 +2089,8 @@
 		$data["max_feed_id"] = (int) $max_feed_id;
 		$data["num_feeds"] = (int) $num_feeds;
 
-		$data['last_article_id'] = getLastArticleId($link);
-		$data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED');
+		$data['last_article_id'] = getLastArticleId();
+		$data['cdm_expanded'] = get_pref( 'CDM_EXPANDED');
 
 		$data['dep_ts'] = calculate_dep_timestamp();
 		$data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE');
@@ -2123,7 +2123,7 @@
 		}
 
 		if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
-				$new_version_details = @check_for_update($link);
+				$new_version_details = @check_for_update();
 
 				$data['new_version_available'] = (int) ($new_version_details != false);
 
@@ -2134,7 +2134,7 @@
 		return $data;
 	}
 
-	function search_to_sql($link, $search) {
+	function search_to_sql( $search) {
 
 		$search_query_part = "";
 
@@ -2155,7 +2155,7 @@
 			case "title":
 				if ($commandpair[1]) {
 					array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE '%".
-						db_escape_string($link, mb_strtolower($commandpair[1]))."%'))");
+						db_escape_string( mb_strtolower($commandpair[1]))."%'))");
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
@@ -2164,7 +2164,7 @@
 			case "author":
 				if ($commandpair[1]) {
 					array_push($query_keywords, "($not (LOWER(author) LIKE '%".
-						db_escape_string($link, mb_strtolower($commandpair[1]))."%'))");
+						db_escape_string( mb_strtolower($commandpair[1]))."%'))");
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
@@ -2178,7 +2178,7 @@
 						array_push($query_keywords, "($not (note IS NULL OR note = ''))");
 					else
 						array_push($query_keywords, "($not (LOWER(note) LIKE '%".
-							db_escape_string($link, mb_strtolower($commandpair[1]))."%'))");
+							db_escape_string( mb_strtolower($commandpair[1]))."%'))");
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
@@ -2211,7 +2211,7 @@
 			default:
 				if (strpos($k, "@") === 0) {
 
-					$user_tz_string = get_pref($link, 'USER_TIMEZONE', $_SESSION['uid']);
+					$user_tz_string = get_pref( 'USER_TIMEZONE', $_SESSION['uid']);
 					$orig_ts = strtotime(substr($k, 1));
 					$k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
 
@@ -2230,35 +2230,35 @@
 		return $search_query_part;
 	}
 
-	function getParentCategories($link, $cat, $owner_uid) {
+	function getParentCategories( $cat, $owner_uid) {
 		$rv = array();
 
-		$result = db_query($link, "SELECT parent_cat FROM ttrss_feed_categories
+		$result = db_query( "SELECT parent_cat FROM ttrss_feed_categories
 			WHERE id = '$cat' AND parent_cat IS NOT NULL AND owner_uid = $owner_uid");
 
 		while ($line = db_fetch_assoc($result)) {
 			array_push($rv, $line["parent_cat"]);
-			$rv = array_merge($rv, getParentCategories($link, $line["parent_cat"], $owner_uid));
+			$rv = array_merge($rv, getParentCategories( $line["parent_cat"], $owner_uid));
 		}
 
 		return $rv;
 	}
 
-	function getChildCategories($link, $cat, $owner_uid) {
+	function getChildCategories( $cat, $owner_uid) {
 		$rv = array();
 
-		$result = db_query($link, "SELECT id FROM ttrss_feed_categories
+		$result = db_query( "SELECT id FROM ttrss_feed_categories
 			WHERE parent_cat = '$cat' AND owner_uid = $owner_uid");
 
 		while ($line = db_fetch_assoc($result)) {
 			array_push($rv, $line["id"]);
-			$rv = array_merge($rv, getChildCategories($link, $line["id"], $owner_uid));
+			$rv = array_merge($rv, getChildCategories( $line["id"], $owner_uid));
 		}
 
 		return $rv;
 	}
 
-	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 (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -2275,7 +2275,7 @@
 						$search_query_part = "ref_id = -1 AND ";
 
 				} else {
-					$search_query_part = search_to_sql($link, $search);
+					$search_query_part = search_to_sql( $search);
 					$search_query_part .= " AND ";
 				}
 
@@ -2293,10 +2293,10 @@
 
 				$override_order = "updated DESC";
 
-				$filter_query_part = filter_to_sql($link, $filter, $owner_uid);
+				$filter_query_part = filter_to_sql( $filter, $owner_uid);
 
 				// Try to check if SQL regexp implementation chokes on a valid regexp
-				$result = db_query($link, "SELECT true AS true_val FROM ttrss_entries,
+				$result = db_query( "SELECT true AS true_val FROM ttrss_entries,
 					ttrss_user_entries, ttrss_feeds, ttrss_feed_categories
 					WHERE $filter_query_part LIMIT 1", false);
 
@@ -2329,10 +2329,10 @@
 					$view_query_part = " ";
 				} else if ($feed != -1) {
 
-					$unread = getFeedUnread($link, $feed, $cat_view);
+					$unread = getFeedUnread( $feed, $cat_view);
 
 					if ($cat_view && $feed > 0 && $include_children)
-						$unread += getCategoryChildrenUnread($link, $feed);
+						$unread += getCategoryChildrenUnread( $feed);
 
 					if ($unread > 0)
 			        $view_query_part = " unread = true AND ";
@@ -2378,7 +2378,7 @@
 
 				if ($feed > 0) {
 					if ($include_children) {
-						$subcats = getChildCategories($link, $feed, $owner_uid);
+						$subcats = getChildCategories( $feed, $owner_uid);
 						array_push($subcats, $feed);
 						$cats_qpart = join(",", $subcats);
 					} else {
@@ -2398,7 +2398,7 @@
 					if ($feed > 0) {
 						if ($include_children) {
 							# sub-cats
-							$subcats = getChildCategories($link, $feed, $owner_uid);
+							$subcats = getChildCategories( $feed, $owner_uid);
 
 							array_push($subcats, $feed);
 							$query_strategy_part = "cat_id IN (".
@@ -2461,7 +2461,7 @@
 			} else if ($feed == -3) { // fresh virtual feed
 				$query_strategy_part = "unread = true AND score >= 0";
 
-				$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
+				$intl = get_pref( "FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
 				if (DB_TYPE == "pgsql") {
 					$query_strategy_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
@@ -2505,17 +2505,17 @@
 				$feed_title = T_sprintf("Search results: %s", $search);
 			} else {
 				if ($cat_view) {
-					$feed_title = getCategoryTitle($link, $feed);
+					$feed_title = getCategoryTitle( $feed);
 				} else {
 					if (is_numeric($feed) && $feed > 0) {
-						$result = db_query($link, "SELECT title,site_url,last_error
+						$result = db_query( "SELECT title,site_url,last_error
 							FROM ttrss_feeds WHERE id = '$feed' AND owner_uid = $owner_uid");
 
 						$feed_title = db_fetch_result($result, 0, "title");
 						$feed_site_url = db_fetch_result($result, 0, "site_url");
 						$last_error = db_fetch_result($result, 0, "last_error");
 					} else {
-						$feed_title = getFeedTitle($link, $feed);
+						$feed_title = getFeedTitle( $feed);
 					}
 				}
 			}
@@ -2535,7 +2535,7 @@
 				}
 
 				// proper override_order applied above
-				if ($vfeed_query_part && !$ignore_vfeed_group && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
+				if ($vfeed_query_part && !$ignore_vfeed_group && get_pref( 'VFEED_GROUP_BY_FEED', $owner_uid)) {
 					if (!$override_order) {
 						$order_by = "ttrss_feeds.title, $order_by";
 					} else {
@@ -2589,7 +2589,7 @@
 
 				if ($_REQUEST["debug"]) print $query;
 
-				$result = db_query($link, $query);
+				$result = db_query( $query);
 
 			} else {
 				// browsing by tag
@@ -2658,14 +2658,14 @@
 				// $tag_sql = "tag_name = '$feed'";   DEFAULT way
 
 				//				error_log("[". $select_qpart . "][" . $from_qpart . "][" .$where_qpart . "]");
-				$result = db_query($link, $select_qpart . $from_qpart . $where_qpart);
+				$result = db_query( $select_qpart . $from_qpart . $where_qpart);
 			}
 
 			return array($result, $feed_title, $feed_site_url, $last_error);
 
 	}
 
-	function sanitize($link, $str, $force_remove_images = false, $owner = false, $site_url = false) {
+	function sanitize( $str, $force_remove_images = false, $owner = false, $site_url = false) {
 		if (!$owner) $owner = $_SESSION["uid"];
 
 		$res = trim($str); if (!$res) return '';
@@ -2708,7 +2708,7 @@
 				}
 
 				if ($entry->nodeName == 'img') {
-					if (($owner && get_pref($link, "STRIP_IMAGES", $owner)) ||
+					if (($owner && get_pref( "STRIP_IMAGES", $owner)) ||
 							$force_remove_images || $_SESSION["bw_limit"]) {
 
 						$p = $doc->createElement('p');
@@ -2805,7 +2805,7 @@
 		return $doc;
 	}
 
-	function check_for_update($link) {
+	function check_for_update() {
 		if (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) {
 			$version_url = "http://tt-rss.org/version.php?ver=" . VERSION .
 				"&iid=" . sha1(SELF_URL_PATH);
@@ -2825,7 +2825,7 @@
 		return false;
 	}
 
-	function catchupArticlesById($link, $ids, $cmode, $owner_uid = false) {
+	function catchupArticlesById( $ids, $cmode, $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 		if (count($ids) == 0) return;
@@ -2839,32 +2839,32 @@
 		$ids_qpart = join(" OR ", $tmp_ids);
 
 		if ($cmode == 0) {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			unread = false,last_read = NOW()
 			WHERE ($ids_qpart) AND owner_uid = $owner_uid");
 		} else if ($cmode == 1) {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			unread = true
 			WHERE ($ids_qpart) AND owner_uid = $owner_uid");
 		} else {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			unread = NOT unread,last_read = NOW()
 			WHERE ($ids_qpart) AND owner_uid = $owner_uid");
 		}
 
 		/* update ccache */
 
-		$result = db_query($link, "SELECT DISTINCT feed_id FROM ttrss_user_entries
+		$result = db_query( "SELECT DISTINCT feed_id FROM ttrss_user_entries
 			WHERE ($ids_qpart) AND owner_uid = $owner_uid");
 
 		while ($line = db_fetch_assoc($result)) {
-			ccache_update($link, $line["feed_id"], $owner_uid);
+			ccache_update( $line["feed_id"], $owner_uid);
 		}
 	}
 
-	function get_article_tags($link, $id, $owner_uid = 0, $tag_cache = false) {
+	function get_article_tags( $id, $owner_uid = 0, $tag_cache = false) {
 
-		$a_id = db_escape_string($link, $id);
+		$a_id = db_escape_string( $id);
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -2879,7 +2879,7 @@
 		/* check cache first */
 
 		if ($tag_cache === false) {
-			$result = db_query($link, "SELECT tag_cache FROM ttrss_user_entries
+			$result = db_query( "SELECT tag_cache FROM ttrss_user_entries
 				WHERE ref_id = '$id' AND owner_uid = $owner_uid");
 
 			$tag_cache = db_fetch_result($result, 0, "tag_cache");
@@ -2891,7 +2891,7 @@
 
 			/* do it the hard way */
 
-			$tmp_result = db_query($link, $query);
+			$tmp_result = db_query( $query);
 
 			while ($tmp_line = db_fetch_assoc($tmp_result)) {
 				array_push($tags, $tmp_line["tag_name"]);
@@ -2899,9 +2899,9 @@
 
 			/* update the cache */
 
-			$tags_str = db_escape_string($link, join(",", $tags));
+			$tags_str = db_escape_string( join(",", $tags));
 
-			db_query($link, "UPDATE ttrss_user_entries
+			db_query( "UPDATE ttrss_user_entries
 				SET tag_cache = '$tags_str' WHERE ref_id = '$id'
 				AND owner_uid = $owner_uid");
 		}
@@ -2929,7 +2929,7 @@
 		return true;
 	}
 
-	function render_login_form($link) {
+	function render_login_form() {
 		header('Cache-Control: public');
 
 		require_once "login_form.php";
@@ -2972,7 +2972,7 @@
 		return vsprintf(__(array_shift($args)), $args);
 	}
 
-	function format_inline_player($link, $url, $ctype) {
+	function format_inline_player( $url, $ctype) {
 
 		$entry = "";
 
@@ -3013,7 +3013,7 @@
 
 	}
 
-	function format_article($link, $id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
+	function format_article( $id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
 		$rv = array();
@@ -3023,7 +3023,7 @@
 		/* we can figure out feed_id from article id anyway, why do we
 		 * pass feed_id here? let's ignore the argument :( */
 
-		$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'");
 
 		$feed_id = (int) db_fetch_result($result, 0, "feed_id");
@@ -3033,14 +3033,14 @@
 		//if (!$zoom_mode) { print "<article id='$id'><![CDATA["; };
 
 		if ($mark_as_read) {
-			$result = db_query($link, "UPDATE ttrss_user_entries
+			$result = db_query( "UPDATE ttrss_user_entries
 				SET unread = false,last_read = NOW()
 				WHERE ref_id = '$id' AND owner_uid = $owner_uid");
 
-			ccache_update($link, $feed_id, $owner_uid);
+			ccache_update( $feed_id, $owner_uid);
 		}
 
-		$result = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id,
+		$result = db_query( "SELECT id,title,link,content,feed_id,comments,int_id,
 			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 			(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
 			(SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images,
@@ -3060,10 +3060,10 @@
 
 			$tag_cache = $line["tag_cache"];
 
-			$line["tags"] = get_article_tags($link, $id, $owner_uid, $line["tag_cache"]);
+			$line["tags"] = get_article_tags( $id, $owner_uid, $line["tag_cache"]);
 			unset($line["tag_cache"]);
 
-			$line["content"] = sanitize($link, $line["content"], false, $owner_uid,	$line["site_url"]);
+			$line["content"] = sanitize( $line["content"], false, $owner_uid,	$line["site_url"]);
 
 			global $pluginhost;
 
@@ -3106,7 +3106,7 @@
 				$entry_author = __(" - ") . $entry_author;
 			}
 
-			$parsed_updated = make_local_datetime($link, $line["updated"], true,
+			$parsed_updated = make_local_datetime( $line["updated"], true,
 				$owner_uid, true);
 
 			$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
@@ -3163,7 +3163,7 @@
 
 			if ($line["orig_feed_id"]) {
 
-				$tmp_result = db_query($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) {
@@ -3199,7 +3199,7 @@
 			$rv['content'] .= "<div class=\"postContent\">";
 
 			$rv['content'] .= $line["content"];
-			$rv['content'] .= format_article_enclosures($link, $id,
+			$rv['content'] .= format_article_enclosures( $id,
 				sql_bool_to_bool($line["always_display_enclosures"]),
 				$line["content"],
 				sql_bool_to_bool($line["hide_images"]));
@@ -3273,22 +3273,22 @@
 		}
 	} // function encrypt_password
 
-	function load_filters($link, $feed_id, $owner_uid, $action_id = false) {
+	function load_filters( $feed_id, $owner_uid, $action_id = false) {
 		$filters = array();
 
-		$cat_id = (int)getFeedCategory($link, $feed_id);
+		$cat_id = (int)getFeedCategory( $feed_id);
 
-		$result = db_query($link, "SELECT * FROM ttrss_filters2 WHERE
+		$result = db_query( "SELECT * FROM ttrss_filters2 WHERE
 			owner_uid = $owner_uid AND enabled = true ORDER BY order_id, title");
 
 		$check_cats = join(",", array_merge(
-			getParentCategories($link, $cat_id, $owner_uid),
+			getParentCategories( $cat_id, $owner_uid),
 			array($cat_id)));
 
 		while ($line = db_fetch_assoc($result)) {
 			$filter_id = $line["id"];
 
-			$result2 = db_query($link, "SELECT
+			$result2 = db_query( "SELECT
 				r.reg_exp, r.inverse, r.feed_id, r.cat_id, r.cat_filter, t.name AS type_name
 				FROM ttrss_filters2_rules AS r,
 				ttrss_filter_types AS t
@@ -3311,7 +3311,7 @@
 				array_push($rules, $rule);
 			}
 
-			$result2 = db_query($link, "SELECT a.action_param,t.name AS type_name
+			$result2 = db_query( "SELECT a.action_param,t.name AS type_name
 				FROM ttrss_filters2_actions AS a,
 				ttrss_filter_actions AS t
 				WHERE
@@ -3360,10 +3360,10 @@
 		return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
 	}
 
-	function init_plugins($link) {
+	function init_plugins() {
 		global $pluginhost;
 
-		$pluginhost = new PluginHost($link);
+		$pluginhost = new PluginHost(Db::get());
 		$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
 
 		return true;
@@ -3439,7 +3439,7 @@
 	}
 
 
-	function get_feed_category($link, $feed_cat, $parent_cat_id = false) {
+	function get_feed_category( $feed_cat, $parent_cat_id = false) {
 		if ($parent_cat_id) {
 			$parent_qpart = "parent_cat = '$parent_cat_id'";
 			$parent_insert = "'$parent_cat_id'";
@@ -3448,7 +3448,7 @@
 			$parent_insert = "NULL";
 		}
 
-		$result = db_query($link,
+		$result = db_query(
 			"SELECT id FROM ttrss_feed_categories
 			WHERE $parent_qpart AND title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
 
@@ -3459,11 +3459,11 @@
 		}
 	}
 
-	function add_feed_category($link, $feed_cat, $parent_cat_id = false) {
+	function add_feed_category( $feed_cat, $parent_cat_id = false) {
 
 		if (!$feed_cat) return false;
 
-		db_query($link, "BEGIN");
+		db_query( "BEGIN");
 
 		if ($parent_cat_id) {
 			$parent_qpart = "parent_cat = '$parent_cat_id'";
@@ -3475,17 +3475,17 @@
 
 		$feed_cat = mb_substr($feed_cat, 0, 250);
 
-		$result = db_query($link,
+		$result = db_query(
 			"SELECT id FROM ttrss_feed_categories
 			WHERE $parent_qpart AND title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
 
 		if (db_num_rows($result) == 0) {
 
-			$result = db_query($link,
+			$result = db_query(
 				"INSERT INTO ttrss_feed_categories (owner_uid,title,parent_cat)
 				VALUES ('".$_SESSION["uid"]."', '$feed_cat', $parent_insert)");
 
-			db_query($link, "COMMIT");
+			db_query( "COMMIT");
 
 			return true;
 		}
@@ -3493,8 +3493,8 @@
 		return false;
 	}
 
-	function getArticleFeed($link, $id) {
-		$result = db_query($link, "SELECT feed_id FROM ttrss_user_entries
+	function getArticleFeed( $id) {
+		$result = db_query( "SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
@@ -3539,14 +3539,14 @@
 
 	}
 
-	function get_article_enclosures($link, $id) {
+	function get_article_enclosures( $id) {
 
 		$query = "SELECT * FROM ttrss_enclosures
 			WHERE post_id = '$id' AND content_url != ''";
 
 		$rv = array();
 
-		$result = db_query($link, $query);
+		$result = db_query( $query);
 
 		if (db_num_rows($result) > 0) {
 			while ($line = db_fetch_assoc($result)) {
@@ -3557,7 +3557,7 @@
 		return $rv;
 	}
 
-	function save_email_address($link, $email) {
+	function save_email_address( $email) {
 		// FIXME: implement persistent storage of emails
 
 		if (!$_SESSION['stored_emails'])
@@ -3568,22 +3568,22 @@
 	}
 
 
-	function get_feed_access_key($link, $feed_id, $is_cat, $owner_uid = false) {
+	function get_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) {
 			return db_fetch_result($result, 0, "access_key");
 		} else {
-			$key = db_escape_string($link, sha1(uniqid(rand(), true)));
+			$key = db_escape_string( sha1(uniqid(rand(), true)));
 
-			$result = db_query($link, "INSERT INTO ttrss_access_keys
+			$result = db_query( "INSERT INTO ttrss_access_keys
 				(access_key, feed_id, is_cat, owner_uid)
 				VALUES ('$key', '$feed_id', $sql_is_cat, '$owner_uid')");
 
@@ -3627,9 +3627,9 @@
 		return is_html(fetch_file_contents($url, false, $login, $pass));
 	}
 
-	function print_label_select($link, $name, $value, $attributes = "") {
+	function print_label_select( $name, $value, $attributes = "") {
 
-		$result = db_query($link, "SELECT caption FROM ttrss_labels2
+		$result = db_query( "SELECT caption FROM ttrss_labels2
 			WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
 
 		print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
@@ -3651,10 +3651,10 @@
 
 	}
 
-	function format_article_enclosures($link, $id, $always_display_enclosures,
+	function format_article_enclosures( $id, $always_display_enclosures,
 					$article_content, $hide_images = false) {
 
-		$result = get_article_enclosures($link, $id);
+		$result = get_article_enclosures( $id);
 		$rv = '';
 
 		if (count($result) > 0) {
@@ -3672,7 +3672,7 @@
 
 				$filename = substr($url, strrpos($url, "/")+1);
 
-				$player = format_inline_player($link, $url, $ctype);
+				$player = format_inline_player( $url, $ctype);
 
 				if ($player) array_push($entries_inline, $player);
 
@@ -3693,7 +3693,7 @@
 				array_push($entries, $entry);
 			}
 
-			if ($_SESSION['uid'] && !get_pref($link, "STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
+			if ($_SESSION['uid'] && !get_pref( "STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
 				if ($always_display_enclosures ||
 							!preg_match("/<img/i", $article_content)) {
 
@@ -3737,8 +3737,8 @@
 		return $rv;
 	}
 
-	function getLastArticleId($link) {
-		$result = db_query($link, "SELECT MAX(ref_id) AS id FROM ttrss_user_entries
+	function getLastArticleId() {
+		$result = db_query( "SELECT MAX(ref_id) AS id FROM ttrss_user_entries
 			WHERE owner_uid = " . $_SESSION["uid"]);
 
 		if (db_num_rows($result) == 1) {
@@ -3824,7 +3824,7 @@
 		return $ids;
 	}
 
-	function cleanup_tags($link, $days = 14, $limit = 1000) {
+	function cleanup_tags( $days = 14, $limit = 1000) {
 
 		if (DB_TYPE == "pgsql") {
 			$interval_query = "date_updated < NOW() - INTERVAL '$days days'";
@@ -3842,7 +3842,7 @@
 				WHERE post_int_id = int_id AND $interval_query AND
 				ref_id = ttrss_entries.id AND tag_cache != '' LIMIT $limit_part";
 
-			$result = db_query($link, $query);
+			$result = db_query( $query);
 
 			$ids = array();
 
@@ -3853,8 +3853,8 @@
 			if (count($ids) > 0) {
 				$ids = join(",", $ids);
 
-				$tmp_result = db_query($link, "DELETE FROM ttrss_tags WHERE id IN ($ids)");
-				$tags_deleted += db_affected_rows($link, $tmp_result);
+				$tmp_result = db_query( "DELETE FROM ttrss_tags WHERE id IN ($ids)");
+				$tags_deleted += db_affected_rows( $tmp_result);
 			} else {
 				break;
 			}
@@ -3865,8 +3865,8 @@
 		return $tags_deleted;
 	}
 
-	function print_user_stylesheet($link) {
-		$value = get_pref($link, 'USER_STYLESHEET');
+	function print_user_stylesheet() {
+		$value = get_pref( 'USER_STYLESHEET');
 
 		if ($value) {
 			print "<style type=\"text/css\">";
@@ -3922,7 +3922,7 @@
 			return $html;
 	}
 
-	function filter_to_sql($link, $filter, $owner_uid) {
+	function filter_to_sql( $filter, $owner_uid) {
 		$query = array();
 
 		if (DB_TYPE == "pgsql")
@@ -3936,7 +3936,7 @@
 
 			if ($regexp_valid) {
 
-				$rule['reg_exp'] = db_escape_string($link, $rule['reg_exp']);
+				$rule['reg_exp'] = db_escape_string( $rule['reg_exp']);
 
 					switch ($rule["type"]) {
 					case "title":
@@ -3969,13 +3969,13 @@
 				if (isset($rule['inverse'])) $qpart = "NOT ($qpart)";
 
 				if (isset($rule["feed_id"]) && $rule["feed_id"] > 0) {
-					$qpart .= " AND feed_id = " . db_escape_string($link, $rule["feed_id"]);
+					$qpart .= " AND feed_id = " . db_escape_string( $rule["feed_id"]);
 				}
 
 				if (isset($rule["cat_id"])) {
 
 					if ($rule["cat_id"] > 0) {
-						$children = getChildCategories($link, $rule["cat_id"], $owner_uid);
+						$children = getChildCategories( $rule["cat_id"], $owner_uid);
 						array_push($children, $rule["cat_id"]);
 
 						$children = join(",", $children);
@@ -4049,8 +4049,8 @@
        return $tempname;
 	}
 
-	function getFeedCategory($link, $feed) {
-		$result = db_query($link, "SELECT cat_id FROM ttrss_feeds
+	function getFeedCategory( $feed) {
+		$result = db_query( "SELECT cat_id FROM ttrss_feeds
 			WHERE id = '$feed'");
 
 		if (db_num_rows($result) > 0) {
diff --git a/include/labels.php b/include/labels.php
index 655b51555..fc23fca93 100644
--- a/include/labels.php
+++ b/include/labels.php
@@ -1,6 +1,6 @@
 <?php
-	function label_find_id($link, $label, $owner_uid) {
-		$result = db_query($link,
+	function label_find_id( $label, $owner_uid) {
+		$result = db_query(
 			"SELECT id FROM ttrss_labels2 WHERE caption = '$label'
 				AND owner_uid = '$owner_uid' LIMIT 1");
 
@@ -11,12 +11,12 @@
 		}
 	}
 
-	function get_article_labels($link, $id, $owner_uid = false) {
+	function get_article_labels( $id, $owner_uid = false) {
 		$rv = array();
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$result = db_query($link, "SELECT label_cache FROM
+		$result = db_query( "SELECT label_cache FROM
 			ttrss_user_entries WHERE ref_id = '$id' AND owner_uid = " .
 			$owner_uid);
 
@@ -33,7 +33,7 @@
 			}
 		}
 
-		$result = db_query($link,
+		$result = db_query(
 			"SELECT DISTINCT label_id,caption,fg_color,bg_color
 				FROM ttrss_labels2, ttrss_user_labels2
 			WHERE id = label_id
@@ -48,16 +48,16 @@
 		}
 
 		if (count($rv) > 0)
-			label_update_cache($link, $owner_uid, $id, $rv);
+			label_update_cache( $owner_uid, $id, $rv);
 		else
-			label_update_cache($link, $owner_uid, $id, array("no-labels" => 1));
+			label_update_cache( $owner_uid, $id, array("no-labels" => 1));
 
 		return $rv;
 	}
 
 
-	function label_find_caption($link, $label, $owner_uid) {
-		$result = db_query($link,
+	function label_find_caption( $label, $owner_uid) {
+		$result = db_query(
 			"SELECT caption FROM ttrss_labels2 WHERE id = '$label'
 				AND owner_uid = '$owner_uid' LIMIT 1");
 
@@ -68,10 +68,10 @@
 		}
 	}
 
-	function get_all_labels($link, $owner_uid) {
+	function get_all_labels( $owner_uid) {
 		$rv = array();
 
-		$result = db_query($link, "SELECT fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = " . $owner_uid);
+		$result = db_query( "SELECT fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = " . $owner_uid);
 
 		while ($line = db_fetch_assoc($result)) {
 			array_push($rv, $line);
@@ -80,50 +80,50 @@
 		return $rv;
 	}
 
-	function label_update_cache($link, $owner_uid, $id, $labels = false, $force = false) {
+	function label_update_cache( $owner_uid, $id, $labels = false, $force = false) {
 
 		if ($force)
-			label_clear_cache($link, $id);
+			label_clear_cache( $id);
 
 		if (!$labels)
-			$labels = get_article_labels($link, $id);
+			$labels = get_article_labels( $id);
 
-		$labels = db_escape_string($link, json_encode($labels));
+		$labels = db_escape_string( json_encode($labels));
 
-		db_query($link, "UPDATE ttrss_user_entries SET
+		db_query( "UPDATE ttrss_user_entries SET
 			label_cache = '$labels' WHERE ref_id = '$id' AND  owner_uid = '$owner_uid'");
 
 	}
 
-	function label_clear_cache($link, $id) {
+	function label_clear_cache( $id) {
 
-		db_query($link, "UPDATE ttrss_user_entries SET
+		db_query( "UPDATE ttrss_user_entries SET
 			label_cache = '' WHERE ref_id = '$id'");
 
 	}
 
-	function label_remove_article($link, $id, $label, $owner_uid) {
+	function label_remove_article( $id, $label, $owner_uid) {
 
-		$label_id = label_find_id($link, $label, $owner_uid);
+		$label_id = label_find_id( $label, $owner_uid);
 
 		if (!$label_id) return;
 
-		$result = db_query($link,
+		$result = db_query(
 			"DELETE FROM ttrss_user_labels2
 			WHERE
 				label_id = '$label_id' AND
 				article_id = '$id'");
 
-		label_clear_cache($link, $id);
+		label_clear_cache( $id);
 	}
 
-	function label_add_article($link, $id, $label, $owner_uid) {
+	function label_add_article( $id, $label, $owner_uid) {
 
-		$label_id = label_find_id($link, $label, $owner_uid);
+		$label_id = label_find_id( $label, $owner_uid);
 
 		if (!$label_id) return;
 
-		$result = db_query($link,
+		$result = db_query(
 			"SELECT
 				article_id FROM ttrss_labels2, ttrss_user_labels2
 			WHERE
@@ -133,66 +133,66 @@
 			LIMIT 1");
 
 		if (db_num_rows($result) == 0) {
-			db_query($link, "INSERT INTO ttrss_user_labels2
+			db_query( "INSERT INTO ttrss_user_labels2
 				(label_id, article_id) VALUES ('$label_id', '$id')");
 		}
 
-		label_clear_cache($link, $id);
+		label_clear_cache( $id);
 
 	}
 
-	function label_remove($link, $id, $owner_uid) {
+	function label_remove( $id, $owner_uid) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		db_query($link, "BEGIN");
+		db_query( "BEGIN");
 
-		$result = db_query($link, "SELECT caption FROM ttrss_labels2
+		$result = db_query( "SELECT caption FROM ttrss_labels2
 			WHERE id = '$id'");
 
 		$caption = db_fetch_result($result, 0, "caption");
 
-		$result = db_query($link, "DELETE FROM ttrss_labels2 WHERE id = '$id'
+		$result = db_query( "DELETE FROM ttrss_labels2 WHERE id = '$id'
 			AND owner_uid = " . $owner_uid);
 
-		if (db_affected_rows($link, $result) != 0 && $caption) {
+		if (db_affected_rows( $result) != 0 && $caption) {
 
 			/* Remove access key for the label */
 
 			$ext_id = LABEL_BASE_INDEX - 1 - $id;
 
-			db_query($link, "DELETE FROM ttrss_access_keys WHERE
+			db_query( "DELETE FROM ttrss_access_keys WHERE
 				feed_id = '$ext_id' AND owner_uid = $owner_uid");
 
 			/* Remove cached data */
 
-			db_query($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 = " . $owner_uid);
 
 		}
 
-		db_query($link, "COMMIT");
+		db_query( "COMMIT");
 	}
 
-	function label_create($link, $caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
+	function label_create( $caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
-		db_query($link, "BEGIN");
+		db_query( "BEGIN");
 
 		$result = false;
 
-		$result = db_query($link, "SELECT id FROM ttrss_labels2
+		$result = db_query( "SELECT id FROM ttrss_labels2
 			WHERE caption = '$caption' AND owner_uid = $owner_uid");
 
 		if (db_num_rows($result) == 0) {
-			$result = db_query($link,
+			$result = db_query(
 				"INSERT INTO ttrss_labels2 (caption,owner_uid,fg_color,bg_color)
 					VALUES ('$caption', '$owner_uid', '$fg_color', '$bg_color')");
 
-			$result = db_affected_rows($link, $result) != 0;
+			$result = db_affected_rows( $result) != 0;
 		}
 
-		db_query($link, "COMMIT");
+		db_query( "COMMIT");
 
 		return $result;
 	}
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 9ea2662fc..14f4f0b78 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -3,32 +3,32 @@
 	define('DAEMON_FEED_LIMIT', 100);
 	define('DAEMON_SLEEP_INTERVAL', 60);
 
-	function update_feedbrowser_cache($link) {
+	function update_feedbrowser_cache() {
 
-		$result = db_query($link, "SELECT feed_url, site_url, title, COUNT(id) AS subscribers
+		$result = db_query( "SELECT feed_url, site_url, title, COUNT(id) AS subscribers
 	  		FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
 				WHERE tf.feed_url = ttrss_feeds.feed_url
 				AND (private IS true OR auth_login != '' OR auth_pass != '' OR feed_url LIKE '%:%@%/%'))
 				GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT 1000");
 
-		db_query($link, "BEGIN");
+		db_query( "BEGIN");
 
-		db_query($link, "DELETE FROM ttrss_feedbrowser_cache");
+		db_query( "DELETE FROM ttrss_feedbrowser_cache");
 
 		$count = 0;
 
 		while ($line = db_fetch_assoc($result)) {
-			$subscribers = db_escape_string($link, $line["subscribers"]);
-			$feed_url = db_escape_string($link, $line["feed_url"]);
-			$title = db_escape_string($link, $line["title"]);
-			$site_url = db_escape_string($link, $line["site_url"]);
+			$subscribers = db_escape_string( $line["subscribers"]);
+			$feed_url = db_escape_string( $line["feed_url"]);
+			$title = db_escape_string( $line["title"]);
+			$site_url = db_escape_string( $line["site_url"]);
 
-			$tmp_result = db_query($link, "SELECT subscribers FROM
+			$tmp_result = db_query( "SELECT subscribers FROM
 				ttrss_feedbrowser_cache WHERE feed_url = '$feed_url'");
 
 			if (db_num_rows($tmp_result) == 0) {
 
-				db_query($link, "INSERT INTO ttrss_feedbrowser_cache
+				db_query( "INSERT INTO ttrss_feedbrowser_cache
 					(feed_url, site_url, title, subscribers) VALUES ('$feed_url',
 						'$site_url', '$title', '$subscribers')");
 
@@ -38,7 +38,7 @@
 
 		}
 
-		db_query($link, "COMMIT");
+		db_query( "COMMIT");
 
 		return $count;
 
@@ -57,10 +57,10 @@
 	 * @param boolean $debug Set to false to disable debug output. Default to true.
 	 * @return void
 	 */
-	function update_daemon_common($link, $limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) {
+	function update_daemon_common( $limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) {
 		// Process all other feeds using last_updated and interval parameters
 
-		$schema_version = get_schema_version($link);
+		$schema_version = get_schema_version();
 
 		if ($schema_version != SCHEMA_VERSION) {
 			die("Schema version is wrong, please upgrade the database.\n");
@@ -116,7 +116,7 @@
 		$random_qpart = sql_random_function();
 
 		// We search for feed needing update.
-		$result = db_query($link, "SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart
+		$result = db_query( "SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -134,7 +134,7 @@
 		// Here is a little cache magic in order to minimize risk of double feed updates.
 		$feeds_to_update = array();
 		while ($line = db_fetch_assoc($result)) {
-			array_push($feeds_to_update, db_escape_string($link, $line['feed_url']));
+			array_push($feeds_to_update, db_escape_string( $line['feed_url']));
 		}
 
 		// We update the feed last update started date before anything else.
@@ -145,16 +145,16 @@
 			$feeds_quoted = array();
 
 			foreach ($feeds_to_update as $feed) {
-				array_push($feeds_quoted, "'" . db_escape_string($link, $feed) . "'");
+				array_push($feeds_quoted, "'" . db_escape_string( $feed) . "'");
 			}
 
-			db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
+			db_query( sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
 				WHERE feed_url IN (%s)", implode(',', $feeds_quoted)));
 		}
 
 		expire_cached_files($debug);
 		expire_lock_files($debug);
-		expire_error_log($link, $debug);
+		expire_error_log( $debug);
 
 		$nf = 0;
 
@@ -162,16 +162,16 @@
 		foreach ($feeds_to_update as $feed) {
 			if($debug) _debug("Base feed: $feed");
 
-			//update_rss_feed($link, $line["id"], true);
+			//update_rss_feed( $line["id"], true);
 
 			// since we have the data cached, we can deal with other feeds with the same url
 
-			$tmp_result = db_query($link, "SELECT DISTINCT ttrss_feeds.id,last_updated
+			$tmp_result = db_query( "SELECT DISTINCT ttrss_feeds.id,last_updated
 			FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
 				ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
 				ttrss_users.id = ttrss_user_prefs.owner_uid AND
 				ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND
-				feed_url = '".db_escape_string($link, $feed)."' AND
+				feed_url = '".db_escape_string( $feed)."' AND
 				(ttrss_feeds.update_interval > 0 OR
 					ttrss_user_prefs.value != '-1')
 				$login_thresh_qpart
@@ -180,7 +180,7 @@
 			if (db_num_rows($tmp_result) > 0) {
 				while ($tline = db_fetch_assoc($tmp_result)) {
 					if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"]);
-					update_rss_feed($link, $tline["id"], true);
+					update_rss_feed( $tline["id"], true);
 					++$nf;
 				}
 			}
@@ -189,14 +189,14 @@
 		require_once "digest.php";
 
 		// Send feed digests by email if needed.
-		send_headlines_digests($link, $debug);
+		send_headlines_digests( $debug);
 
 		return $nf;
 
 	} // function update_daemon_common
 
 	// ignore_daemon is not used
-	function update_rss_feed($link, $feed, $ignore_daemon = false, $no_cache = false,
+	function update_rss_feed( $feed, $ignore_daemon = false, $no_cache = false,
 		$override_url = false) {
 
 		require_once "lib/simplepie/simplepie.inc";
@@ -207,7 +207,7 @@
 			_debug("update_rss_feed: start");
 		}
 
-		$result = db_query($link, "SELECT id,update_interval,auth_login,
+		$result = db_query( "SELECT id,update_interval,auth_login,
 			feed_url,auth_pass,cache_images,last_updated,
 			mark_unread_on_update, owner_uid,
 			pubsub_state, auth_pass_encrypted
@@ -228,7 +228,7 @@
 		$auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result,
 			0, "auth_pass_encrypted"));
 
-		db_query($link, "UPDATE ttrss_feeds SET last_update_started = NOW()
+		db_query( "UPDATE ttrss_feeds SET last_update_started = NOW()
 			WHERE id = '$feed'");
 
 		$auth_login = db_fetch_result($result, 0, "auth_login");
@@ -242,7 +242,7 @@
 		$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
 		$fetch_url = db_fetch_result($result, 0, "feed_url");
 
-		$feed = db_escape_string($link, $feed);
+		$feed = db_escape_string( $feed);
 
 		if ($override_url) $fetch_url = $override_url;
 
@@ -252,7 +252,7 @@
 
 		// Ignore cache if new feed or manual update.
 		$cache_age = ($no_cache || is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ?
-			30 : get_feed_update_interval($link, $feed) * 60;
+			30 : get_feed_update_interval( $feed) * 60;
 
 		if ($debug_enabled) {
 			_debug("update_rss_feed: cache filename: $cache_filename exists: " . file_exists($cache_filename));
@@ -322,14 +322,14 @@
 
 				// If-Modified-Since
 				if ($fetch_last_error_code != 304) {
-					$error_escaped = db_escape_string($link, $fetch_last_error);
+					$error_escaped = db_escape_string( $fetch_last_error);
 				} else {
 					if ($debug_enabled) {
 						_debug("update_rss_feed: source claims data not modified, nothing to do.");
 					}
 				}
 
-				db_query($link,
+				db_query(
 					"UPDATE ttrss_feeds SET last_error = '$error_escaped',
 						last_updated = NOW() WHERE id = '$feed'");
 
@@ -337,9 +337,9 @@
 			}
 		}
 
-		$pluginhost = new PluginHost($link);
+		$pluginhost = new PluginHost();
 		$pluginhost->set_debug($debug_enabled);
-		$user_plugins = get_pref($link, "_ENABLED_PLUGINS", $owner_uid);
+		$user_plugins = get_pref( "_ENABLED_PLUGINS", $owner_uid);
 
 		$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
 		$pluginhost->load($user_plugins, $pluginhost::KIND_USER, $owner_uid);
@@ -364,7 +364,7 @@
 
 //		print_r($rss);
 
-		$feed = db_escape_string($link, $feed);
+		$feed = db_escape_string( $feed);
 
 		if (!$rss->error()) {
 
@@ -388,7 +388,7 @@
 				_debug("update_rss_feed: processing feed data...");
 			}
 
-//			db_query($link, "BEGIN");
+//			db_query( "BEGIN");
 
 			if (DB_TYPE == "pgsql") {
 				$favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'";
@@ -396,7 +396,7 @@
 				$favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
 			}
 
-			$result = db_query($link, "SELECT title,site_url,owner_uid,
+			$result = db_query( "SELECT title,site_url,owner_uid,
 				(favicon_last_checked IS NULL OR $favicon_interval_qpart) AS
 						favicon_needs_check
 				FROM ttrss_feeds WHERE id = '$feed'");
@@ -408,7 +408,7 @@
 
 			$owner_uid = db_fetch_result($result, 0, "owner_uid");
 
-			$site_url = db_escape_string($link, mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
+			$site_url = db_escape_string( mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
 
 			if ($favicon_needs_check || $force_refetch) {
 				if ($debug_enabled) {
@@ -421,31 +421,31 @@
 				if (file_exists($favicon_file)) {
 						require_once "colors.php";
 
-						$favicon_color = db_escape_string($link,
+						$favicon_color = db_escape_string(
 							calculate_avg_color($favicon_file));
 
 						$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
 				}
 
-				db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
+				db_query( "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
 					$favicon_colorstring
 					WHERE id = '$feed'");
 			}
 
 			if (!$registered_title || $registered_title == "[Unknown]") {
 
-				$feed_title = db_escape_string($link, $rss->get_title());
+				$feed_title = db_escape_string( $rss->get_title());
 
 				if ($debug_enabled) {
 					_debug("update_rss_feed: registering title: $feed_title");
 				}
 
-				db_query($link, "UPDATE ttrss_feeds SET
+				db_query( "UPDATE ttrss_feeds SET
 					title = '$feed_title' WHERE id = '$feed'");
 			}
 
 			if ($site_url && $orig_site_url != $site_url) {
-				db_query($link, "UPDATE ttrss_feeds SET
+				db_query( "UPDATE ttrss_feeds SET
 					site_url = '$site_url' WHERE id = '$feed'");
 			}
 
@@ -453,8 +453,8 @@
 				_debug("update_rss_feed: loading filters & labels...");
 			}
 
-			$filters = load_filters($link, $feed, $owner_uid);
-			$labels = get_all_labels($link, $owner_uid);
+			$filters = load_filters( $feed, $owner_uid);
+			$labels = get_all_labels( $owner_uid);
 
 			if ($debug_enabled) {
 				//print_r($filters);
@@ -468,7 +468,7 @@
 					_debug("update_rss_feed: no articles found.");
 				}
 
-				db_query($link, "UPDATE ttrss_feeds
+				db_query( "UPDATE ttrss_feeds
 					SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
 
 				return; // no articles
@@ -506,7 +506,7 @@
 					if ($debug_enabled)
 						_debug("update_rss_feed: feed hub url found, subscribe request sent.");
 
-					db_query($link, "UPDATE ttrss_feeds SET pubsub_state = 1
+					db_query( "UPDATE ttrss_feeds SET pubsub_state = 1
 						WHERE id = '$feed'");
 				}
 			}
@@ -528,7 +528,7 @@
 
 				$entry_guid = "$owner_uid,$entry_guid";
 
-				$entry_guid_hashed = db_escape_string($link, 'SHA1:' . sha1($entry_guid));
+				$entry_guid_hashed = db_escape_string( 'SHA1:' . sha1($entry_guid));
 
 				if ($debug_enabled) {
 					_debug("update_rss_feed: guid $entry_guid / $entry_guid_hashed");
@@ -578,13 +578,13 @@
 					$entry_author = $entry_author_item->get_name();
 					if (!$entry_author) $entry_author = $entry_author_item->get_email();
 
-					$entry_author = db_escape_string($link, $entry_author);
+					$entry_author = db_escape_string( $entry_author);
 				}
 
-				$entry_guid = db_escape_string($link, mb_substr($entry_guid, 0, 245));
+				$entry_guid = db_escape_string( mb_substr($entry_guid, 0, 245));
 
-				$entry_comments = db_escape_string($link, mb_substr($entry_comments, 0, 245));
-				$entry_author = db_escape_string($link, mb_substr($entry_author, 0, 245));
+				$entry_comments = db_escape_string( mb_substr($entry_comments, 0, 245));
+				$entry_author = db_escape_string( mb_substr($entry_author, 0, 245));
 
 				$num_comments = $item->get_item_tags('http://purl.org/rss/1.0/modules/slash/', 'comments');
 
@@ -641,8 +641,8 @@
 				}
 
 				// FIXME not sure if owner_uid is a good idea here, we may have a base entry without user entry (?)
-				$result = db_query($link, "SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries
-					WHERE ref_id = id AND (guid = '".db_escape_string($link, $entry_guid)."' OR guid = '$entry_guid_hashed') AND owner_uid = $owner_uid");
+				$result = db_query( "SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries
+					WHERE ref_id = id AND (guid = '".db_escape_string( $entry_guid)."' OR guid = '$entry_guid_hashed') AND owner_uid = $owner_uid");
 
 				if (db_num_rows($result) != 0) {
 					$entry_plugin_data = db_fetch_result($result, 0, "plugin_data");
@@ -671,11 +671,11 @@
 				}
 
 				$entry_tags = $article["tags"];
-				$entry_guid = db_escape_string($link, $entry_guid);
-				$entry_title = db_escape_string($link, $article["title"]);
-				$entry_author = db_escape_string($link, $article["author"]);
-				$entry_link = db_escape_string($link, $article["link"]);
-				$entry_plugin_data = db_escape_string($link, $article["plugin_data"]);
+				$entry_guid = db_escape_string( $entry_guid);
+				$entry_title = db_escape_string( $article["title"]);
+				$entry_author = db_escape_string( $article["author"]);
+				$entry_link = db_escape_string( $article["link"]);
+				$entry_plugin_data = db_escape_string( $article["plugin_data"]);
 				$entry_content = $article["content"]; // escaped below
 
 
@@ -686,13 +686,13 @@
 				if ($cache_images && is_writable(CACHE_DIR . '/images'))
 					cache_images($entry_content, $site_url, $debug_enabled);
 
-				$entry_content = db_escape_string($link, $entry_content, false);
+				$entry_content = db_escape_string( $entry_content, false);
 
 				$content_hash = "SHA1:" . sha1($entry_content);
 
-				db_query($link, "BEGIN");
+				db_query( "BEGIN");
 
-				$result = db_query($link, "SELECT id FROM	ttrss_entries
+				$result = db_query( "SELECT id FROM	ttrss_entries
 					WHERE (guid = '$entry_guid' OR guid = '$entry_guid_hashed')");
 
 				if (db_num_rows($result) == 0) {
@@ -703,7 +703,7 @@
 
 					// base post entry does not exist, create it
 
-					$result = db_query($link,
+					$result = db_query(
 						"INSERT INTO ttrss_entries
 							(title,
 							guid,
@@ -745,15 +745,15 @@
 
 					$base_entry_id = db_fetch_result($result, 0, "id");
 
-					db_query($link, "UPDATE ttrss_entries SET date_updated = NOW()
+					db_query( "UPDATE ttrss_entries SET date_updated = NOW()
 						WHERE id = '$base_entry_id'");
 
-					$article_labels = get_article_labels($link, $base_entry_id, $owner_uid);
+					$article_labels = get_article_labels( $base_entry_id, $owner_uid);
 				}
 
 				// now it should exist, if not - bad luck then
 
-				$result = db_query($link, "SELECT
+				$result = db_query( "SELECT
 						id,content_hash,no_orig_date,title,plugin_data,guid,
 						".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated,
 						".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
@@ -786,14 +786,14 @@
 					if ($stored_guid != $entry_guid_hashed) {
 						if ($debug_enabled) _debug("upgrading compat guid to hashed one");
 
-						db_query($link, "UPDATE ttrss_entries SET guid = '$entry_guid_hashed' WHERE
+						db_query( "UPDATE ttrss_entries SET guid = '$entry_guid_hashed' WHERE
 							id = '$ref_id'");
 					} */
 
 					// check for user post link to main table
 
 					// do we allow duplicate posts with same GUID in different feeds?
-					if (get_pref($link, "ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
+					if (get_pref( "ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
 						$dupcheck_qpart = "AND (feed_id = '$feed' OR feed_id IS NULL)";
 					} else {
 						$dupcheck_qpart = "";
@@ -813,7 +813,7 @@
 					}
 
 					if (find_article_filter($article_filters, "filter")) {
-						db_query($link, "COMMIT"); // close transaction in progress
+						db_query( "COMMIT"); // close transaction in progress
 						continue;
 					}
 
@@ -829,7 +829,7 @@
 
 //					if ($_REQUEST["xdebug"]) print "$query\n";
 
-					$result = db_query($link, $query);
+					$result = db_query( $query);
 
 					// okay it doesn't exist - create user entry
 					if (db_num_rows($result) == 0) {
@@ -862,7 +862,7 @@
 
 						if (DB_TYPE == "pgsql" and defined('_NGRAM_TITLE_DUPLICATE_THRESHOLD')) {
 
-							$result = db_query($link, "SELECT COUNT(*) AS similar FROM
+							$result = db_query( "SELECT COUNT(*) AS similar FROM
 									ttrss_entries,ttrss_user_entries
 								WHERE ref_id = id AND updated >= NOW() - INTERVAL '7 day'
 									AND similarity(title, '$entry_title') >= "._NGRAM_TITLE_DUPLICATE_THRESHOLD."
@@ -882,7 +882,7 @@
 						$last_marked = ($marked == 'true') ? 'NOW()' : 'NULL';
 						$last_published = ($published == 'true') ? 'NOW()' : 'NULL';
 
-						$result = db_query($link,
+						$result = db_query(
 							"INSERT INTO ttrss_user_entries
 								(ref_id, owner_uid, feed_id, unread, last_read, marked,
 								published, score, tag_cache, label_cache, uuid,
@@ -894,14 +894,14 @@
 						if (PUBSUBHUBBUB_HUB && $published == 'true') {
 							$rss_link = get_self_url_prefix() .
 								"/public.php?op=rss&id=-2&key=" .
-								get_feed_access_key($link, -2, false, $owner_uid);
+								get_feed_access_key( -2, false, $owner_uid);
 
 							$p = new Publisher(PUBSUBHUBBUB_HUB);
 
 							$pubsub_result = $p->publish_update($rss_link);
 						}
 
-						$result = db_query($link,
+						$result = db_query(
 							"SELECT int_id FROM ttrss_user_entries WHERE
 								ref_id = '$ref_id' AND owner_uid = '$owner_uid' AND
 								feed_id = '$feed' LIMIT 1");
@@ -940,7 +940,7 @@
 						$update_insignificant = false;
 					}
 
-					if (db_escape_string($link, $orig_title) != $entry_title) {
+					if (db_escape_string( $orig_title) != $entry_title) {
 						$post_needs_update = true;
 						$update_insignificant = false;
 					}
@@ -955,7 +955,7 @@
 
 //						print "<!-- post $orig_title needs update : $post_needs_update -->";
 
-						db_query($link, "UPDATE ttrss_entries
+						db_query( "UPDATE ttrss_entries
 							SET title = '$entry_title', content = '$entry_content',
 								content_hash = '$content_hash',
 								updated = '$entry_timestamp_fmt',
@@ -965,20 +965,20 @@
 
 						if (!$update_insignificant) {
 							if ($mark_unread_on_update) {
-								db_query($link, "UPDATE ttrss_user_entries
+								db_query( "UPDATE ttrss_user_entries
 									SET last_read = null, unread = true WHERE ref_id = '$ref_id'");
 							}
 						}
 					}
 				}
 
-				db_query($link, "COMMIT");
+				db_query( "COMMIT");
 
 				if ($debug_enabled) {
 					_debug("update_rss_feed: assigning labels...");
 				}
 
-				assign_article_to_label_filters($link, $entry_ref_id, $article_filters,
+				assign_article_to_label_filters( $entry_ref_id, $article_filters,
 					$owner_uid, $article_labels);
 
 				if ($debug_enabled) {
@@ -1004,24 +1004,24 @@
 					print_r($enclosures);
 				}
 
-				db_query($link, "BEGIN");
+				db_query( "BEGIN");
 
 				foreach ($enclosures as $enc) {
-					$enc_url = db_escape_string($link, $enc[0]);
-					$enc_type = db_escape_string($link, $enc[1]);
-					$enc_dur = db_escape_string($link, $enc[2]);
+					$enc_url = db_escape_string( $enc[0]);
+					$enc_type = db_escape_string( $enc[1]);
+					$enc_dur = db_escape_string( $enc[2]);
 
-					$result = db_query($link, "SELECT id FROM ttrss_enclosures
+					$result = db_query( "SELECT id FROM ttrss_enclosures
 						WHERE content_url = '$enc_url' AND post_id = '$entry_ref_id'");
 
 					if (db_num_rows($result) == 0) {
-						db_query($link, "INSERT INTO ttrss_enclosures
+						db_query( "INSERT INTO ttrss_enclosures
 							(content_url, content_type, title, duration, post_id) VALUES
 							('$enc_url', '$enc_type', '', '$enc_dur', '$entry_ref_id')");
 					}
 				}
 
-				db_query($link, "COMMIT");
+				db_query( "COMMIT");
 
 				// check for manual tags (we have to do it here since they're loaded from filters)
 
@@ -1040,7 +1040,7 @@
 
 				// Skip boring tags
 
-				$boring_tags = trim_array(explode(",", mb_strtolower(get_pref($link,
+				$boring_tags = trim_array(explode(",", mb_strtolower(get_pref(
 					'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
 
 				$filtered_tags = array();
@@ -1065,22 +1065,22 @@
 
 				if (count($filtered_tags) > 0) {
 
-					db_query($link, "BEGIN");
+					db_query( "BEGIN");
 
 					foreach ($filtered_tags as $tag) {
 
 						$tag = sanitize_tag($tag);
-						$tag = db_escape_string($link, $tag);
+						$tag = db_escape_string( $tag);
 
 						if (!tag_is_valid($tag)) continue;
 
-						$result = db_query($link, "SELECT id FROM ttrss_tags
+						$result = db_query( "SELECT id FROM ttrss_tags
 							WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND
 							owner_uid = '$owner_uid' LIMIT 1");
 
 							if ($result && db_num_rows($result) == 0) {
 
-								db_query($link, "INSERT INTO ttrss_tags
+								db_query( "INSERT INTO ttrss_tags
 									(owner_uid,tag_name,post_int_id)
 									VALUES ('$owner_uid','$tag', '$entry_int_id')");
 							}
@@ -1092,16 +1092,16 @@
 
 					$tags_to_cache = array_unique($tags_to_cache);
 
-					$tags_str = db_escape_string($link, join(",", $tags_to_cache));
+					$tags_str = db_escape_string( join(",", $tags_to_cache));
 
-					db_query($link, "UPDATE ttrss_user_entries
+					db_query( "UPDATE ttrss_user_entries
 						SET tag_cache = '$tags_str' WHERE ref_id = '$entry_ref_id'
 						AND owner_uid = $owner_uid");
 
-					db_query($link, "COMMIT");
+					db_query( "COMMIT");
 				}
 
-				if (get_pref($link, "AUTO_ASSIGN_LABELS", $owner_uid, false)) {
+				if (get_pref( "AUTO_ASSIGN_LABELS", $owner_uid, false)) {
 					if ($debug_enabled) {
 						_debug("update_rss_feed: auto-assigning labels...");
 					}
@@ -1111,7 +1111,7 @@
 
 						if ($caption && preg_match("/\b$caption\b/i", "$tags_str " . strip_tags($entry_content) . " $entry_title")) {
 							if (!labels_contains_caption($article_labels, $caption)) {
-								label_add_article($link, $entry_ref_id, $caption, $owner_uid);
+								label_add_article( $entry_ref_id, $caption, $owner_uid);
 							}
 						}
 					}
@@ -1126,29 +1126,29 @@
 				if ($debug_enabled) {
 					_debug("update_rss_feed: new feed, catching it up...");
 				}
-				catchup_feed($link, $feed, false, $owner_uid);
+				catchup_feed( $feed, false, $owner_uid);
 			}
 
 			if ($debug_enabled) {
 				_debug("purging feed...");
 			}
 
-			purge_feed($link, $feed, 0, $debug_enabled);
+			purge_feed( $feed, 0, $debug_enabled);
 
-			db_query($link, "UPDATE ttrss_feeds
+			db_query( "UPDATE ttrss_feeds
 				SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
 
-//			db_query($link, "COMMIT");
+//			db_query( "COMMIT");
 
 		} else {
 
-			$error_msg = db_escape_string($link, mb_substr($rss->error(), 0, 245));
+			$error_msg = db_escape_string( mb_substr($rss->error(), 0, 245));
 
 			if ($debug_enabled) {
 				_debug("update_rss_feed: error fetching feed: $error_msg");
 			}
 
-			db_query($link,
+			db_query(
 				"UPDATE ttrss_feeds SET last_error = '$error_msg',
 					last_updated = NOW() WHERE id = '$feed'");
 		}
@@ -1204,14 +1204,14 @@
 		return $doc->saveXML($node);
 	}
 
-	function expire_error_log($link, $debug) {
+	function expire_error_log( $debug) {
 		if ($debug) _debug("Removing old error log entries...");
 
 		if (DB_TYPE == "pgsql") {
-			db_query($link, "DELETE FROM ttrss_error_log
+			db_query( "DELETE FROM ttrss_error_log
 				WHERE created_at < NOW() - INTERVAL '7 days'");
 		} else {
-			db_query($link, "DELETE FROM ttrss_error_log
+			db_query( "DELETE FROM ttrss_error_log
 				WHERE created_at < DATE_SUB(NOW(), INTERVAL 7 DAY)");
 		}
 
@@ -1284,7 +1284,7 @@
 		return $params;
 	}
 
-	function get_article_filters($filters, $title, $content, $link, $timestamp, $author, $tags) {
+	function get_article_filters($filters, $title, $content,  $timestamp, $author, $tags) {
 		$matches = array();
 
 		foreach ($filters as $filter) {
@@ -1399,11 +1399,11 @@
 		return false;
 	}
 
-	function assign_article_to_label_filters($link, $id, $filters, $owner_uid, $article_labels) {
+	function assign_article_to_label_filters( $id, $filters, $owner_uid, $article_labels) {
 		foreach ($filters as $f) {
 			if ($f["type"] == "label") {
 				if (!labels_contains_caption($article_labels, $f["param"])) {
-					label_add_article($link, $id, $f["param"], $owner_uid);
+					label_add_article( $id, $f["param"], $owner_uid);
 				}
 			}
 		}
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 29de4ff5e..0477efd50 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -21,7 +21,7 @@
 		return $url_path;
 	}
 
-	function initial_sanity_check($link) {
+	function initial_sanity_check() {
 
 		$errors = array();
 
@@ -88,14 +88,10 @@
 			}
 
 			if (SINGLE_USER_MODE) {
-				$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+				$result = db_query( "SELECT id FROM ttrss_users WHERE id = 1");
 
-				if ($link) {
-					$result = db_query($link, "SELECT id FROM ttrss_users WHERE id = 1");
-
-					if (db_num_rows($result) != 1) {
-						array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
-					}
+				if (db_num_rows($result) != 1) {
+					array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
 				}
 			}
 
@@ -202,6 +198,6 @@
 		}
 	}
 
-	initial_sanity_check($link);
+	initial_sanity_check();
 
 ?>
diff --git a/include/sessions.php b/include/sessions.php
index f6e8bfe61..c4876489f 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -36,7 +36,7 @@
 		}
 	}
 
-	function validate_session($link) {
+	function validate_session() {
 		if (SINGLE_USER_MODE) return true;
 
 		if (VERSION != $_SESSION["version"]) return false;
diff --git a/index.php b/index.php
index 66e236dae..cb95b96f0 100644
--- a/index.php
+++ b/index.php
@@ -32,7 +32,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_plugins($link)) return;
+	if (!init_plugins()) return;
 
 	global $pluginhost;
 
@@ -49,7 +49,7 @@
 		}
 	}
 
-	login_sequence($link);
+	login_sequence();
 
 	header('Content-Type: text/html; charset=utf-8');
 
@@ -65,14 +65,14 @@
 	<?php echo stylesheet_tag("cdm.css"); ?>
 
 	<?php if ($_SESSION["uid"]) {
-		$theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
+		$theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
 		if ($theme) {
 			echo stylesheet_tag("themes/$theme");
 		}
 	}
 	?>
 
-	<?php print_user_stylesheet($link) ?>
+	<?php print_user_stylesheet() ?>
 
 	<style type="text/css">
 	<?php
@@ -285,7 +285,7 @@
 </div>
 </div>
 
-<?php db_close($link); ?>
+<?php db_close(); ?>
 
 </body>
 </html>
diff --git a/opml.php b/opml.php
index 709cfd4cc..c8fbf1c39 100644
--- a/opml.php
+++ b/opml.php
@@ -12,21 +12,21 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_plugins($link)) return;
+	if (!init_plugins()) return;
 
 	$op = $_REQUEST['op'];
 
 	if ($op == "publish"){
-		$key = db_escape_string($link, $_REQUEST["key"]);
+		$key = db_escape_string( $_REQUEST["key"]);
 
-		$result = db_query($link, "SELECT owner_uid
+		$result = db_query( "SELECT owner_uid
 				FROM ttrss_access_keys WHERE
 				access_key = '$key' AND feed_id = 'OPML:Publish'");
 
 		if (db_num_rows($result) == 1) {
 			$owner_uid = db_fetch_result($result, 0, "owner_uid");
 
-			$opml = new Opml($link, $_REQUEST);
+			$opml = new Opml( $_REQUEST);
 			$opml->opml_export("", $owner_uid, true, false);
 
 		} else {
@@ -34,6 +34,6 @@
 		}
 	}
 
-	db_close($link);
+	db_close();
 
 ?>
diff --git a/plugins/af_buttersafe/init.php b/plugins/af_buttersafe/init.php
index c9f6505cd..e1a01b3dd 100644
--- a/plugins/af_buttersafe/init.php
+++ b/plugins/af_buttersafe/init.php
@@ -1,7 +1,6 @@
 <?php
 class Af_Buttersafe extends Plugin {
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +10,6 @@ class Af_Buttersafe extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
diff --git a/plugins/af_explosm/init.php b/plugins/af_explosm/init.php
index 2a8fab491..b5e34657c 100644
--- a/plugins/af_explosm/init.php
+++ b/plugins/af_explosm/init.php
@@ -1,7 +1,6 @@
 <?php
 class Af_Explosm extends Plugin {
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +10,6 @@ class Af_Explosm extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
diff --git a/plugins/af_gocomics/init.php b/plugins/af_gocomics/init.php
index 466ec9687..39dd0c852 100644
--- a/plugins/af_gocomics/init.php
+++ b/plugins/af_gocomics/init.php
@@ -1,7 +1,5 @@
 <?php
 class Af_GoComics extends Plugin {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +9,6 @@ class Af_GoComics extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
diff --git a/plugins/af_pennyarcade/init.php b/plugins/af_pennyarcade/init.php
index 06c1230a6..d897d85ca 100644
--- a/plugins/af_pennyarcade/init.php
+++ b/plugins/af_pennyarcade/init.php
@@ -1,7 +1,6 @@
 <?php
 class Af_PennyArcade extends Plugin {
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +10,6 @@ class Af_PennyArcade extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
@@ -22,11 +20,11 @@ class Af_PennyArcade extends Plugin {
 
 		if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "Comic:") !== FALSE) {
 			if (strpos($article["plugin_data"], "pennyarcade,$owner_uid:") === FALSE) {
-				
+
 				if ($debug_enabled) {
 					_debug("af_pennyarcade: Processing comic");
 				}
-				
+
 				$doc = new DOMDocument();
 				$doc->loadHTML(fetch_file_contents($article["link"]));
 
@@ -49,7 +47,7 @@ class Af_PennyArcade extends Plugin {
 				$article["content"] = $article["stored"]["content"];
 			}
 		}
-	
+
 		if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "News Post:") !== FALSE) {
 			if (strpos($article["plugin_data"], "pennyarcade,$owner_uid:") === FALSE) {
 				if ($debug_enabled) {
@@ -57,22 +55,22 @@ class Af_PennyArcade extends Plugin {
 				}
 				$doc = new DOMDocument();
 				$doc->loadHTML(fetch_file_contents($article["link"]));
-				
+
 				if ($doc) {
 					$xpath = new DOMXPath($doc);
 					$entries = $xpath->query('(//div[@class="post"])');
-					
+
 					$basenode = false;
-					
+
 					foreach ($entries as $entry) {
 						$basenode = $entry;
 					}
-					
+
 					$uninteresting = $xpath->query('(//div[@class="heading"])');
 					foreach ($uninteresting as $i) {
 						$i->parentNode->removeChild($i);
 					}
-					
+
 					if ($basenode){
 						$article["content"] = $doc->saveXML($basenode);
 						$article["plugin_data"] = "pennyarcade,$owner_uid:" . $article["plugin_data"];
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index f2d5c7b67..d5b3e5c20 100644
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -1,7 +1,5 @@
 <?php
 class Af_RedditImgur extends Plugin {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +9,6 @@ class Af_RedditImgur extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
diff --git a/plugins/af_unburn/init.php b/plugins/af_unburn/init.php
index f3cc1eefa..67939f80e 100644
--- a/plugins/af_unburn/init.php
+++ b/plugins/af_unburn/init.php
@@ -1,7 +1,5 @@
 <?php
 class Af_Unburn extends Plugin {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +9,6 @@ class Af_Unburn extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php
index e2b02b05d..b6d8e97dc 100644
--- a/plugins/auth_internal/init.php
+++ b/plugins/auth_internal/init.php
@@ -1,7 +1,5 @@
 <?php
 class Auth_Internal extends Plugin implements IAuthModule {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -12,7 +10,6 @@ class Auth_Internal extends Plugin implements IAuthModule {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_AUTH_USER, $this);
@@ -22,12 +19,12 @@ class Auth_Internal extends Plugin implements IAuthModule {
 
 		$pwd_hash1 = encrypt_password($password);
 		$pwd_hash2 = encrypt_password($password, $login);
-		$login = db_escape_string($this->link, $login);
-		$otp = db_escape_string($this->link, $_REQUEST["otp"]);
+		$login = db_escape_string( $login);
+		$otp = db_escape_string( $_REQUEST["otp"]);
 
-		if (get_schema_version($this->link) > 96) {
+		if (get_schema_version() > 96) {
 			if (!defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) {
-				$result = db_query($this->link, "SELECT otp_enabled,salt FROM ttrss_users WHERE
+				$result = db_query( "SELECT otp_enabled,salt FROM ttrss_users WHERE
 					login = '$login'");
 
 				if (db_num_rows($result) > 0) {
@@ -75,9 +72,9 @@ class Auth_Internal extends Plugin implements IAuthModule {
 			}
 		}
 
-		if (get_schema_version($this->link) > 87) {
+		if (get_schema_version() > 87) {
 
-			$result = db_query($this->link, "SELECT salt FROM ttrss_users WHERE
+			$result = db_query( "SELECT salt FROM ttrss_users WHERE
 				login = '$login'");
 
 			if (db_num_rows($result) != 1) {
@@ -95,7 +92,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
 
 				// verify and upgrade password to new salt base
 
-				$result = db_query($this->link, $query);
+				$result = db_query( $query);
 
 				if (db_num_rows($result) == 1) {
 					// upgrade password to MODE2
@@ -103,7 +100,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
 					$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 					$pwd_hash = encrypt_password($password, $salt, true);
 
-					db_query($this->link, "UPDATE ttrss_users SET
+					db_query( "UPDATE ttrss_users SET
 						pwd_hash = '$pwd_hash', salt = '$salt' WHERE login = '$login'");
 
 					$query = "SELECT id
@@ -131,7 +128,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
 					pwd_hash = '$pwd_hash2')";
 		}
 
-		$result = db_query($this->link, $query);
+		$result = db_query( $query);
 
 		if (db_num_rows($result) == 1) {
 			return db_fetch_result($result, 0, "id");
@@ -141,9 +138,9 @@ class Auth_Internal extends Plugin implements IAuthModule {
 	}
 
 	function check_password($owner_uid, $password) {
-		$owner_uid = db_escape_string($this->link, $owner_uid);
+		$owner_uid = db_escape_string( $owner_uid);
 
-		$result = db_query($this->link, "SELECT salt,login FROM ttrss_users WHERE
+		$result = db_query( "SELECT salt,login FROM ttrss_users WHERE
 			id = '$owner_uid'");
 
 		$salt = db_fetch_result($result, 0, "salt");
@@ -164,20 +161,20 @@ class Auth_Internal extends Plugin implements IAuthModule {
 				id = '$owner_uid' AND pwd_hash = '$password_hash'";
 		}
 
-		$result = db_query($this->link, $query);
+		$result = db_query( $query);
 
 		return db_num_rows($result) != 0;
 	}
 
 	function change_password($owner_uid, $old_password, $new_password) {
-		$owner_uid = db_escape_string($this->link, $owner_uid);
+		$owner_uid = db_escape_string( $owner_uid);
 
 		if ($this->check_password($owner_uid, $old_password)) {
 
 			$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 			$new_password_hash = encrypt_password($new_password, $new_salt, true);
 
-			db_query($this->link, "UPDATE ttrss_users SET
+			db_query( "UPDATE ttrss_users SET
 				pwd_hash = '$new_password_hash', salt = '$new_salt', otp_enabled = false
 					WHERE id = '$owner_uid'");
 
diff --git a/plugins/auth_remote/init.php b/plugins/auth_remote/init.php
index 7e4638fb2..f0da1afc8 100644
--- a/plugins/auth_remote/init.php
+++ b/plugins/auth_remote/init.php
@@ -1,7 +1,6 @@
 <?php
 class Auth_Remote extends Plugin implements IAuthModule {
 
-	private $link;
 	private $host;
 	private $base;
 
@@ -13,23 +12,22 @@ class Auth_Remote extends Plugin implements IAuthModule {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
-		$this->base = new Auth_Base($this->link);
+		$this->base = new Auth_Base();
 
 		$host->add_hook($host::HOOK_AUTH_USER, $this);
 	}
 
 	function get_login_by_ssl_certificate() {
-		$cert_serial = db_escape_string($this->link, get_ssl_certificate_id());
+		$cert_serial = db_escape_string( get_ssl_certificate_id());
 
 		if ($cert_serial) {
-			$result = db_query($this->link, "SELECT login FROM ttrss_user_prefs, ttrss_users
+			$result = db_query( "SELECT login FROM ttrss_user_prefs, ttrss_users
 				WHERE pref_name = 'SSL_CERT_SERIAL' AND value = '$cert_serial' AND
 				owner_uid = ttrss_users.id");
 
 			if (db_num_rows($result) != 0) {
-				return db_escape_string($this->link, db_fetch_result($result, 0, "login"));
+				return db_escape_string( db_fetch_result($result, 0, "login"));
 			}
 		}
 
@@ -38,10 +36,10 @@ class Auth_Remote extends Plugin implements IAuthModule {
 
 
 	function authenticate($login, $password) {
-		$try_login = db_escape_string($this->link, $_SERVER["REMOTE_USER"]);
+		$try_login = db_escape_string( $_SERVER["REMOTE_USER"]);
 
 		// php-cgi
-		if (!$try_login) $try_login = db_escape_string($this->link, $_SERVER["REDIRECT_REMOTE_USER"]);
+		if (!$try_login) $try_login = db_escape_string( $_SERVER["REDIRECT_REMOTE_USER"]);
 
 		if (!$try_login) $try_login = $this->get_login_by_ssl_certificate();
 #	  	if (!$try_login) $try_login = "test_qqq";
@@ -60,15 +58,15 @@ class Auth_Remote extends Plugin implements IAuthModule {
 					// update user name
 					$fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN'];
 					if ($fullname){
-						$fullname = db_escape_string($this->link, $fullname);
-						db_query($this->link, "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " .
+						$fullname = db_escape_string( $fullname);
+						db_query( "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " .
 							$user_id);
 					}
 					// update user mail
 					$email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL'];
 					if ($email){
-						$email = db_escape_string($this->link, $email);
-						db_query($this->link, "UPDATE ttrss_users SET email = '$email' WHERE id = " .
+						$email = db_escape_string( $email);
+						db_query( "UPDATE ttrss_users SET email = '$email' WHERE id = " .
 							$user_id);
 					}
 				}
diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index 22f4f05a7..be0da83c9 100644
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -1,6 +1,5 @@
 <?php
 class Bookmarklets extends Plugin {
-  private $link;
   private $host;
 
   function about() {
@@ -10,7 +9,6 @@ class Bookmarklets extends Plugin {
   }
 
   function init($host) {
-    $this->link = $host->get_link();
     $this->host = $host;
 
     $host->add_hook($host::HOOK_PREFS_TAB, $this);
diff --git a/plugins/close_button/init.php b/plugins/close_button/init.php
index ff2027bc7..6fdd96f55 100644
--- a/plugins/close_button/init.php
+++ b/plugins/close_button/init.php
@@ -1,10 +1,8 @@
 <?php
 class Close_Button extends Plugin {
-	private $link;
 	private $host;
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
@@ -17,7 +15,7 @@ class Close_Button extends Plugin {
 	}
 
 	function hook_article_button($line) {
-		if (!get_pref($this->link, "COMBINED_DISPLAY_MODE")) {
+		if (!get_pref( "COMBINED_DISPLAY_MODE")) {
 			$rv = "<img src=\"plugins/close_button/button.png\"
 				class='tagsPic' style=\"cursor : pointer\"
 				onclick=\"closeArticlePanel()\"
diff --git a/plugins/digest/digest_body.php b/plugins/digest/digest_body.php
index e7434fe70..18932e536 100644
--- a/plugins/digest/digest_body.php
+++ b/plugins/digest/digest_body.php
@@ -1,5 +1,3 @@
-<?php global $link; ?>
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -25,7 +23,7 @@
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-	<?php print_user_stylesheet($link) ?>
+	<?php print_user_stylesheet(); ?>
 
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
diff --git a/plugins/digest/init.php b/plugins/digest/init.php
index e65ae13d7..5b84fec16 100644
--- a/plugins/digest/init.php
+++ b/plugins/digest/init.php
@@ -1,8 +1,6 @@
 <?php
 // TODO: digest should register digest specific hotkey actions within tt-rss
 class Digest extends Plugin implements IHandler {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -13,7 +11,6 @@ class Digest extends Plugin implements IHandler {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_handler("digest", "*", $this);
@@ -22,10 +19,7 @@ class Digest extends Plugin implements IHandler {
 	function index() {
 		header("Content-type: text/html; charset=utf-8");
 
-		login_sequence($this->link);
-
-		global $link;
-		$link = $this->link;
+		login_sequence();
 
 		require_once dirname(__FILE__) . "/digest_body.php";
 	}
@@ -47,13 +41,13 @@ class Digest extends Plugin implements IHandler {
 	}
 
 	function digestgetcontents() {
-		$article_id = db_escape_string($this->link, $_REQUEST['article_id']);
+		$article_id = db_escape_string( $_REQUEST['article_id']);
 
-		$result = db_query($this->link, "SELECT content,title,link,marked,published
+		$result = db_query( "SELECT content,title,link,marked,published
 			FROM ttrss_entries, ttrss_user_entries
 			WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']);
 
-		$content = sanitize($this->link, db_fetch_result($result, 0, "content"));
+		$content = sanitize( db_fetch_result($result, 0, "content"));
 		$title = strip_tags(db_fetch_result($result, 0, "title"));
 		$article_url = htmlspecialchars(db_fetch_result($result, 0, "link"));
 		$marked = sql_bool_to_bool(db_fetch_result($result, 0, "marked"));
@@ -61,15 +55,15 @@ class Digest extends Plugin implements IHandler {
 
 		print json_encode(array("article" =>
 			array("id" => $article_id, "url" => $article_url,
-				"tags" => get_article_tags($this->link, $article_id),
+				"tags" => get_article_tags( $article_id),
 				"marked" => $marked, "published" => $published,
 				"title" => $title, "content" => $content)));
 	}
 
 	function digestupdate() {
-		$feed_id = db_escape_string($this->link, $_REQUEST['feed_id']);
-		$offset = db_escape_string($this->link, $_REQUEST['offset']);
-		$seq = db_escape_string($this->link, $_REQUEST['seq']);
+		$feed_id = db_escape_string( $_REQUEST['feed_id']);
+		$offset = db_escape_string( $_REQUEST['offset']);
+		$seq = db_escape_string( $_REQUEST['seq']);
 
 		if (!$feed_id) $feed_id = -4;
 		if (!$offset) $offset = 0;
@@ -78,18 +72,18 @@ class Digest extends Plugin implements IHandler {
 
 		$reply['seq'] = $seq;
 
-		$headlines = API::api_get_headlines($this->link, $feed_id, 30, $offset,
+		$headlines = API::api_get_headlines( $feed_id, 30, $offset,
 				'', ($feed_id == -4), true, false, "unread", "updated DESC", 0, 0);
 
 		$reply['headlines'] = array();
-		$reply['headlines']['title'] = getFeedTitle($this->link, $feed_id);
+		$reply['headlines']['title'] = getFeedTitle( $feed_id);
 		$reply['headlines']['content'] = $headlines;
 
 		print json_encode($reply);
 	}
 
 	function digestinit() {
-		$tmp_feeds = API::api_get_feeds($this->link, -4, true, false, 0);
+		$tmp_feeds = API::api_get_feeds( -4, true, false, 0);
 
 		$params = array();
 		$feeds = array();
@@ -99,7 +93,7 @@ class Digest extends Plugin implements IHandler {
 		}
 
 		if ($_REQUEST["init"] == 1) {
-			$params["hotkeys"] = get_hotkeys_map($this->link);
+			$params["hotkeys"] = get_hotkeys_map();
 		}
 		$params["feeds"] = $feeds;
 
diff --git a/plugins/embed_original/init.php b/plugins/embed_original/init.php
index 0e0eb9603..f91acda7c 100644
--- a/plugins/embed_original/init.php
+++ b/plugins/embed_original/init.php
@@ -1,10 +1,8 @@
 <?php
 class Embed_Original extends Plugin {
-	private $link;
 	private $host;
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
@@ -36,9 +34,9 @@ class Embed_Original extends Plugin {
 	}
 
 	function getUrl() {
-		$id = db_escape_string($this->link, $_REQUEST['id']);
+		$id = db_escape_string( $_REQUEST['id']);
 
-		$result = db_query($this->link, "SELECT link
+		$result = db_query( "SELECT link
 				FROM ttrss_entries, ttrss_user_entries
 				WHERE id = '$id' AND ref_id = id AND owner_uid = " .$_SESSION['uid']);
 
diff --git a/plugins/example/init.php b/plugins/example/init.php
index 333efd92d..8deee84b4 100644
--- a/plugins/example/init.php
+++ b/plugins/example/init.php
@@ -2,8 +2,6 @@
 class Example extends Plugin {
 
 	// Demonstrates how to add a separate panel to the preferences screen and inject Javascript/save data using Dojo forms.
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -15,14 +13,13 @@ class Example extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_PREFS_TAB, $this);
 	}
 
 	function save() {
-		$example_value = db_escape_string($this->link, $_POST["example_value"]);
+		$example_value = db_escape_string( $_POST["example_value"]);
 
 		$this->host->set($this, "example", $example_value);
 
diff --git a/plugins/example_api/init.php b/plugins/example_api/init.php
index a5f34b865..9e0ad18b9 100644
--- a/plugins/example_api/init.php
+++ b/plugins/example_api/init.php
@@ -6,7 +6,6 @@ class Example_Api extends Plugin {
 	// 1. status (STATUS_OK or STATUS_ERR)
 	// 2. arbitrary payload
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -18,7 +17,6 @@ class Example_Api extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_api_method("example_testmethod", $this);
diff --git a/plugins/example_article/init.php b/plugins/example_article/init.php
index 05f95a40a..000be7c4c 100644
--- a/plugins/example_article/init.php
+++ b/plugins/example_article/init.php
@@ -1,7 +1,6 @@
 <?php
 class Example_Article extends Plugin {
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -12,7 +11,6 @@ class Example_Article extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_RENDER_ARTICLE, $this);
diff --git a/plugins/example_feed/init.php b/plugins/example_feed/init.php
index af14d3ff3..19d089667 100644
--- a/plugins/example_feed/init.php
+++ b/plugins/example_feed/init.php
@@ -4,7 +4,6 @@ class Example_Feed extends Plugin {
 	// Demonstrates how to query data from the parsed feed object (SimplePie)
 	// don't enable unless debugging feed through f D hotkey or manually.
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -15,7 +14,6 @@ class Example_Feed extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_FEED_PARSED, $this);
diff --git a/plugins/example_routing/init.php b/plugins/example_routing/init.php
index 31c5b6f28..0ae446e33 100644
--- a/plugins/example_routing/init.php
+++ b/plugins/example_routing/init.php
@@ -12,7 +12,6 @@ class Example_Routing extends Plugin implements IHandler {
 	// Any system method may be masked by plugins. You can mask
 	// entire handler by supplying "*" instead of a method name.
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -23,7 +22,6 @@ class Example_Routing extends Plugin implements IHandler {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_handler("test", "example", $this);
diff --git a/plugins/example_vfeed/init.php b/plugins/example_vfeed/init.php
index e646809a4..e7efa757b 100644
--- a/plugins/example_vfeed/init.php
+++ b/plugins/example_vfeed/init.php
@@ -6,7 +6,6 @@ class Example_VFeed extends Plugin {
 
 	// Not implemented yet: stuff for 3 panel mode
 
-	private $link;
 	private $host;
 	private $dummy_id;
 
@@ -18,7 +17,6 @@ class Example_VFeed extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$this->dummy_id = $host->add_feed(-1, 'Dummy feed', 'images/pub_set.svg', $this);
@@ -29,7 +27,7 @@ class Example_VFeed extends Plugin {
 	}
 
 	function get_headlines($feed_id, $options) {
-		$qfh_ret = queryFeedHeadlines($this->link, -4,
+		$qfh_ret = queryFeedHeadlines( -4,
 			$options['limit'],
 			$options['view_mode'], $options['cat_view'],
 			$options['search'],
diff --git a/plugins/googlereaderimport/init.php b/plugins/googlereaderimport/init.php
index d25d3288f..8986f469c 100644
--- a/plugins/googlereaderimport/init.php
+++ b/plugins/googlereaderimport/init.php
@@ -1,8 +1,5 @@
 <?php
 class GoogleReaderImport extends Plugin {
-
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -14,7 +11,6 @@ class GoogleReaderImport extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_command("greader-import",
@@ -34,11 +30,11 @@ class GoogleReaderImport extends Plugin {
 
 		_debug("please enter your username:");
 
-		$username = db_escape_string($this->link, trim(read_stdin()));
+		$username = db_escape_string( trim(read_stdin()));
 
 		_debug("looking up user: $username...");
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_users
+		$result = db_query( "SELECT id FROM ttrss_users
 			WHERE login = '$username'");
 
 		if (db_num_rows($result) == 0) {
@@ -59,7 +55,7 @@ class GoogleReaderImport extends Plugin {
 
 	function import($file = false, $owner_uid = 0) {
 
-		purge_orphans($this->link);
+		purge_orphans();
 
 		if (!$file) {
 			header("Content-Type: text/html");
@@ -115,30 +111,30 @@ class GoogleReaderImport extends Plugin {
 				foreach ($doc['items'] as $item) {
 //					print_r($item);
 
-					$guid = db_escape_string($this->link, mb_substr($item['id'], 0, 250));
-					$title = db_escape_string($this->link, $item['title']);
+					$guid = db_escape_string( mb_substr($item['id'], 0, 250));
+					$title = db_escape_string( $item['title']);
 					$updated = date('Y-m-d h:i:s', $item['updated']);
 					$link = '';
 					$content = '';
-					$author = db_escape_string($this->link, $item['author']);
+					$author = db_escape_string( $item['author']);
 					$tags = array();
 					$orig_feed_data = array();
 
 					if (is_array($item['alternate'])) {
 						foreach ($item['alternate'] as $alt) {
 							if (isset($alt['type']) && $alt['type'] == 'text/html') {
-								$link = db_escape_string($this->link, $alt['href']);
+								$link = db_escape_string( $alt['href']);
 							}
 						}
 					}
 
 					if (is_array($item['summary'])) {
-						$content = db_escape_string($this->link,
+						$content = db_escape_string(
 							$item['summary']['content'], false);
 					}
 
 					if (is_array($item['content'])) {
-						$content = db_escape_string($this->link,
+						$content = db_escape_string(
 							$item['content']['content'], false);
 					}
 
@@ -153,14 +149,14 @@ class GoogleReaderImport extends Plugin {
 					if (is_array($item['origin'])) {
 						if (strpos($item['origin']['streamId'], 'feed/') === 0) {
 
-							$orig_feed_data['feed_url'] = db_escape_string($this->link,
+							$orig_feed_data['feed_url'] = db_escape_string(
 								mb_substr(preg_replace("/^feed\//",
 									"", $item['origin']['streamId']), 0, 200));
 
-							$orig_feed_data['title'] = db_escape_string($this->link,
+							$orig_feed_data['title'] = db_escape_string(
 								mb_substr($item['origin']['title'], 0, 200));
 
-							$orig_feed_data['site_url'] = db_escape_string($this->link,
+							$orig_feed_data['site_url'] = db_escape_string(
 								mb_substr($item['origin']['htmlUrl'], 0, 200));
 						}
 					}
@@ -168,7 +164,7 @@ class GoogleReaderImport extends Plugin {
 					$processed++;
 
 					$imported += (int) $this->create_article($owner_uid, $guid, $title,
-						$updated, $link, $content, $author, $sql_set_marked, $tags,
+						$updated,  $content, $author, $sql_set_marked, $tags,
 						$orig_feed_data);
 
 					if ($file && $processed % 25 == 0) {
@@ -200,7 +196,7 @@ class GoogleReaderImport extends Plugin {
 	}
 
 	// expects ESCAPED data
-	private function create_article($owner_uid, $guid, $title, $updated, $link, $content, $author, $marked, $tags, $orig_feed_data) {
+	private function create_article($owner_uid, $guid, $title, $updated,  $content, $author, $marked, $tags, $orig_feed_data) {
 
 		if (!$guid) $guid = sha1($link);
 
@@ -210,9 +206,9 @@ class GoogleReaderImport extends Plugin {
 
 		$content_hash = sha1($content);
 
-		if (filter_var($link, FILTER_VALIDATE_URL) === FALSE) return false;
+		if (filter_var( FILTER_VALIDATE_URL) === FALSE) return false;
 
-		db_query($this->link, "BEGIN");
+		db_query( "BEGIN");
 
 		$feed_id = 'NULL';
 
@@ -223,7 +219,7 @@ class GoogleReaderImport extends Plugin {
 		// before dealing with archived feeds we must check ttrss_feeds to maintain id consistency
 
 		if ($orig_feed_data['feed_url'] && $create_archived_feeds) {
-				$result = db_query($this->link,
+				$result = db_query(
 					"SELECT id FROM ttrss_feeds WHERE feed_url = '".$orig_feed_data['feed_url']."'
 						AND owner_uid = $owner_uid");
 
@@ -234,7 +230,7 @@ class GoogleReaderImport extends Plugin {
 
 				if (!$orig_feed_data['title']) $orig_feed_data['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 ($owner_uid,
@@ -243,7 +239,7 @@ class GoogleReaderImport extends Plugin {
 						'".$orig_feed_data['title']."',
 						NULL, '', '', 0)");
 
-				$result = db_query($this->link,
+				$result = db_query(
 					"SELECT id FROM ttrss_feeds WHERE feed_url = '".$orig_feed_data['feed_url']."'
 						AND owner_uid = $owner_uid");
 
@@ -258,18 +254,18 @@ class GoogleReaderImport extends Plugin {
 			// locate archived entry to file entries in, we don't want to file them in actual feeds because of purging
 			// maybe file marked in real feeds because eh
 
-			$result = db_query($this->link, "SELECT id FROM ttrss_archived_feeds WHERE
+			$result = db_query( "SELECT id FROM ttrss_archived_feeds WHERE
 				feed_url = '".$orig_feed_data['feed_url']."' AND owner_uid = $owner_uid");
 
 			if (db_num_rows($result) != 0) {
 				$orig_feed_id = db_fetch_result($result, 0, "id");
 			} else {
-				db_query($this->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'");
 
-				$result = db_query($this->link, "SELECT id FROM ttrss_archived_feeds WHERE
+				$result = db_query( "SELECT id FROM ttrss_archived_feeds WHERE
 					feed_url = '".$orig_feed_data['feed_url']."' AND owner_uid = $owner_uid");
 
 				if (db_num_rows($result) != 0) {
@@ -280,32 +276,32 @@ class GoogleReaderImport extends Plugin {
 
 		// delete temporarily inserted feed
 		if ($feed_id && $feed_inserted) {
-				db_query($this->link, "DELETE FROM ttrss_feeds WHERE id = $feed_id");
+				db_query( "DELETE FROM ttrss_feeds WHERE id = $feed_id");
 		}
 
 		if (!$orig_feed_id) $orig_feed_id = 'NULL';
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
+		$result = db_query( "SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
 			guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
 
 		if (db_num_rows($result) == 0) {
-			$result = db_query($this->link, "INSERT INTO ttrss_entries
+			$result = db_query( "INSERT INTO ttrss_entries
 				(title, guid, link, updated, content, content_hash, date_entered, date_updated, author)
 				VALUES
 				('$title', '$guid', '$link', '$updated', '$content', '$content_hash', NOW(), NOW(), '$author')");
 
-			$result = db_query($this->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($this->link, "INSERT INTO ttrss_user_entries
+				db_query( "INSERT INTO ttrss_user_entries
 					(ref_id, uuid, feed_id, orig_feed_id, owner_uid, marked, tag_cache, label_cache,
 						last_read, note, unread, last_marked)
 					VALUES
 					('$ref_id', '', NULL, $orig_feed_id, $owner_uid, $marked, '', '', NOW(), '', false, NOW())");
 
-				$result = db_query($this->link, "SELECT int_id FROM ttrss_user_entries, ttrss_entries
+				$result = db_query( "SELECT int_id FROM ttrss_user_entries, ttrss_entries
 					WHERE owner_uid = $owner_uid AND ref_id = id AND ref_id = $ref_id");
 
 				if (db_num_rows($result) != 0 && is_array($tags)) {
@@ -315,16 +311,16 @@ class GoogleReaderImport extends Plugin {
 
 					foreach ($tags as $tag) {
 
-						$tag = db_escape_string($this->link, sanitize_tag($tag));
+						$tag = db_escape_string( sanitize_tag($tag));
 
 						if (!tag_is_valid($tag)) continue;
 
-						$result = db_query($this->link, "SELECT id FROM ttrss_tags
+						$result = db_query( "SELECT id FROM ttrss_tags
 							WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND
 							owner_uid = '$owner_uid' LIMIT 1");
 
 							if ($result && db_num_rows($result) == 0) {
-								db_query($this->link, "INSERT INTO ttrss_tags
+								db_query( "INSERT INTO ttrss_tags
 									(owner_uid,tag_name,post_int_id)
 									VALUES ('$owner_uid','$tag', '$entry_int_id')");
 							}
@@ -335,9 +331,9 @@ class GoogleReaderImport extends Plugin {
 					/* update the cache */
 
 					$tags_to_cache = array_unique($tags_to_cache);
-					$tags_str = db_escape_string($this->link, join(",", $tags_to_cache));
+					$tags_str = db_escape_string( 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 = '$ref_id'
 						AND owner_uid = $owner_uid");
 				}
@@ -346,7 +342,7 @@ class GoogleReaderImport extends Plugin {
 			}
 		}
 
-		db_query($this->link, "COMMIT");
+		db_query( "COMMIT");
 
 		return $rc;
 	}
diff --git a/plugins/googlereaderkeys/init.php b/plugins/googlereaderkeys/init.php
index afdc58ec7..27428a488 100644
--- a/plugins/googlereaderkeys/init.php
+++ b/plugins/googlereaderkeys/init.php
@@ -1,7 +1,5 @@
 <?php
 class GoogleReaderKeys extends Plugin {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +9,6 @@ class GoogleReaderKeys extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_HOTKEY_MAP, $this);
diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php
index a01a612a4..981a2b581 100644
--- a/plugins/import_export/init.php
+++ b/plugins/import_export/init.php
@@ -1,11 +1,8 @@
 <?php
 class Import_Export extends Plugin implements IHandler {
-
-	private $link;
 	private $host;
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_PREFS_TAB, $this);
@@ -29,11 +26,11 @@ class Import_Export extends Plugin implements IHandler {
 
 		_debug("please enter your username:");
 
-		$username = db_escape_string($this->link, trim(read_stdin()));
+		$username = db_escape_string( trim(read_stdin()));
 
 		_debug("importing $filename for user $username...\n");
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE login = '$username'");
+		$result = db_query( "SELECT id FROM ttrss_users WHERE login = '$username'");
 
 		if (db_num_rows($result) == 0) {
 			print "error: could not find user $username.\n";
@@ -42,11 +39,11 @@ class Import_Export extends Plugin implements IHandler {
 
 		$owner_uid = db_fetch_result($result, 0, "id");
 
-		$this->perform_data_import($this->link, $filename, $owner_uid);
+		$this->perform_data_import( $filename, $owner_uid);
 	}
 
 	function save() {
-		$example_value = db_escape_string($this->link, $_POST["example_value"]);
+		$example_value = db_escape_string( $_POST["example_value"]);
 
 		echo "Value set to $example_value (not really)";
 	}
@@ -120,12 +117,12 @@ class Import_Export extends Plugin implements IHandler {
 	}
 
 	function exportrun() {
-		$offset = (int) db_escape_string($this->link, $_REQUEST['offset']);
+		$offset = (int) db_escape_string( $_REQUEST['offset']);
 		$exported = 0;
 		$limit = 250;
 
 		if ($offset < 10000 && is_writable(CACHE_DIR . "/export")) {
-			$result = db_query($this->link, "SELECT
+			$result = db_query( "SELECT
 					ttrss_entries.guid,
 					ttrss_entries.title,
 					content,
@@ -184,7 +181,7 @@ class Import_Export extends Plugin implements IHandler {
 		print json_encode(array("exported" => $exported));
 	}
 
-	function perform_data_import($link, $filename, $owner_uid) {
+	function perform_data_import( $filename, $owner_uid) {
 
 		$num_imported = 0;
 		$num_processed = 0;
@@ -237,7 +234,7 @@ class Import_Export extends Plugin implements IHandler {
 
 					foreach ($article_node->childNodes as $child) {
 						if ($child->nodeName != 'label_cache')
-							$article[$child->nodeName] = db_escape_string($this->link, $child->nodeValue);
+							$article[$child->nodeName] = db_escape_string( $child->nodeValue);
 						else
 							$article[$child->nodeName] = $child->nodeValue;
 					}
@@ -248,16 +245,16 @@ class Import_Export extends Plugin implements IHandler {
 
 						++$num_processed;
 
-						//db_query($link, "BEGIN");
+						//db_query( "BEGIN");
 
 						//print 'GUID:' . $article['guid'] . "\n";
 
-						$result = db_query($link, "SELECT id FROM ttrss_entries
+						$result = db_query( "SELECT id FROM ttrss_entries
 							WHERE guid = '".$article['guid']."'");
 
 						if (db_num_rows($result) == 0) {
 
-							$result = db_query($link,
+							$result = db_query(
 								"INSERT INTO ttrss_entries
 									(title,
 									guid,
@@ -285,7 +282,7 @@ class Import_Export extends Plugin implements IHandler {
 									'0',
 									'')");
 
-							$result = db_query($link, "SELECT id FROM ttrss_entries
+							$result = db_query( "SELECT id FROM ttrss_entries
 								WHERE guid = '".$article['guid']."'");
 
 							if (db_num_rows($result) != 0) {
@@ -306,7 +303,7 @@ class Import_Export extends Plugin implements IHandler {
 							$feed = 'NULL';
 
 							if ($feed_url && $feed_title) {
-								$result = db_query($link, "SELECT id FROM ttrss_feeds
+								$result = db_query( "SELECT id FROM ttrss_feeds
 									WHERE feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
 
 								if (db_num_rows($result) != 0) {
@@ -314,10 +311,10 @@ class Import_Export extends Plugin implements IHandler {
 								} else {
 									// try autocreating feed in Uncategorized...
 
-									$result = db_query($link, "INSERT INTO ttrss_feeds (owner_uid,
+									$result = db_query( "INSERT INTO ttrss_feeds (owner_uid,
 										feed_url, title) VALUES ($owner_uid, '$feed_url', '$feed_title')");
 
-									$result = db_query($link, "SELECT id FROM ttrss_feeds
+									$result = db_query( "SELECT id FROM ttrss_feeds
 										WHERE feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
 
 									if (db_num_rows($result) != 0) {
@@ -335,7 +332,7 @@ class Import_Export extends Plugin implements IHandler {
 
 							//print "$ref_id / $feed / " . $article['title'] . "\n";
 
-							$result = db_query($link, "SELECT int_id FROM ttrss_user_entries
+							$result = db_query( "SELECT int_id FROM ttrss_user_entries
 								WHERE ref_id = '$ref_id' AND owner_uid = '$owner_uid' AND $feed_qpart");
 
 							if (db_num_rows($result) == 0) {
@@ -345,14 +342,14 @@ class Import_Export extends Plugin implements IHandler {
 								$score = (int) $article['score'];
 
 								$tag_cache = $article['tag_cache'];
-								$label_cache = db_escape_string($this->link, $article['label_cache']);
+								$label_cache = db_escape_string( $article['label_cache']);
 								$note = $article['note'];
 
 								//print "Importing " . $article['title'] . "<br/>";
 
 								++$num_imported;
 
-								$result = db_query($link,
+								$result = db_query(
 									"INSERT INTO ttrss_user_entries
 									(ref_id, owner_uid, feed_id, unread, last_read, marked,
 										published, score, tag_cache, label_cache, uuid, note)
@@ -365,15 +362,15 @@ class Import_Export extends Plugin implements IHandler {
 								if (is_array($label_cache) && $label_cache["no-labels"] != 1) {
 									foreach ($label_cache as $label) {
 
-										label_create($link, $label[1],
+										label_create( $label[1],
 											$label[2], $label[3], $owner_uid);
 
-										label_add_article($link, $ref_id, $label[1], $owner_uid);
+										label_add_article( $ref_id, $label[1], $owner_uid);
 
 									}
 								}
 
-								//db_query($link, "COMMIT");
+								//db_query( "COMMIT");
 							}
 						}
 					}
@@ -441,7 +438,7 @@ class Import_Export extends Plugin implements IHandler {
 		}
 
 		if (is_file($tmp_file)) {
-			$this->perform_data_import($this->link, $tmp_file, $_SESSION['uid']);
+			$this->perform_data_import( $tmp_file, $_SESSION['uid']);
 			unlink($tmp_file);
 		} else {
 			print_error(__('No file uploaded.'));
diff --git a/plugins/instances/init.php b/plugins/instances/init.php
index 7f822c7bf..12ae07280 100644
--- a/plugins/instances/init.php
+++ b/plugins/instances/init.php
@@ -1,7 +1,5 @@
 <?php
 class Instances extends Plugin implements IHandler {
-
-	private $link;
 	private $host;
 
 	private $status_codes = array(
@@ -18,7 +16,6 @@ class Instances extends Plugin implements IHandler {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_PREFS_TABS, $this);
@@ -30,7 +27,7 @@ class Instances extends Plugin implements IHandler {
 
 	function hook_update_task($args) {
 		_debug("Get linked feeds...");
-		$this->get_linked_feeds($this->link);
+		$this->get_linked_feeds();
 	}
 
 	// Status codes:
@@ -40,7 +37,7 @@ class Instances extends Plugin implements IHandler {
 	// 2   - did not receive valid data
 	// >10 - server error, code + 10 (e.g. 16 means server error 6)
 
-	function get_linked_feeds($link, $instance_id = false) {
+	function get_linked_feeds( $instance_id = false) {
 		if ($instance_id)
 			$instance_qpart = "id = '$instance_id' AND ";
 		else
@@ -52,7 +49,7 @@ class Instances extends Plugin implements IHandler {
 			$date_qpart = "last_connected < DATE_SUB(NOW(), INTERVAL 6 HOUR)";
 		}
 
-		$result = db_query($link, "SELECT id, access_key, access_url FROM ttrss_linked_instances
+		$result = db_query( "SELECT id, access_key, access_url FROM ttrss_linked_instances
 			WHERE $instance_qpart $date_qpart ORDER BY last_connected");
 
 		while ($line = db_fetch_assoc($result)) {
@@ -80,7 +77,7 @@ class Instances extends Plugin implements IHandler {
 
 						// access denied
 						if ($status == 16) {
-							db_query($link, "DELETE FROM ttrss_linked_feeds
+							db_query( "DELETE FROM ttrss_linked_feeds
 								WHERE instance_id = '$id'");
 						}
 					} else {
@@ -88,16 +85,16 @@ class Instances extends Plugin implements IHandler {
 
 						if (count($feeds['feeds']) > 0) {
 
-							db_query($link, "DELETE FROM ttrss_linked_feeds
+							db_query( "DELETE FROM ttrss_linked_feeds
 								WHERE instance_id = '$id'");
 
 							foreach ($feeds['feeds'] as $feed) {
-								$feed_url = db_escape_string($this->link, $feed['feed_url']);
-								$title = db_escape_string($this->link, $feed['title']);
-								$subscribers = db_escape_string($this->link, $feed['subscribers']);
-								$site_url = db_escape_string($this->link, $feed['site_url']);
+								$feed_url = db_escape_string( $feed['feed_url']);
+								$title = db_escape_string( $feed['title']);
+								$subscribers = db_escape_string( $feed['subscribers']);
+								$site_url = db_escape_string( $feed['site_url']);
 
-								db_query($link, "INSERT INTO ttrss_linked_feeds
+								db_query( "INSERT INTO ttrss_linked_feeds
 									(feed_url, site_url, title, subscribers, instance_id, created, updated)
 								VALUES
 									('$feed_url', '$site_url', '$title', '$subscribers', '$id', NOW(), NOW())");
@@ -122,7 +119,7 @@ class Instances extends Plugin implements IHandler {
 
 			_debug("Status: $status");
 
-			db_query($link, "UPDATE ttrss_linked_instances SET
+			db_query( "UPDATE ttrss_linked_instances SET
 				last_status_out = '$status', last_connected = NOW() WHERE id = '$id'");
 
 		}
@@ -130,7 +127,7 @@ class Instances extends Plugin implements IHandler {
 
 
 	function get_feeds() {
-		$this->get_linked_feeds($this->link, false);
+		$this->get_linked_feeds( false);
 	}
 
 	function get_prefs_js() {
@@ -167,37 +164,37 @@ class Instances extends Plugin implements IHandler {
 	}
 
 	function remove() {
-		$ids = db_escape_string($this->link, $_REQUEST['ids']);
+		$ids = db_escape_string( $_REQUEST['ids']);
 
-		db_query($this->link, "DELETE FROM ttrss_linked_instances WHERE
+		db_query( "DELETE FROM ttrss_linked_instances WHERE
 			id IN ($ids)");
 	}
 
 	function add() {
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
-		$access_url = db_escape_string($this->link, $_REQUEST["access_url"]);
-		$access_key = db_escape_string($this->link, $_REQUEST["access_key"]);
+		$id = db_escape_string( $_REQUEST["id"]);
+		$access_url = db_escape_string( $_REQUEST["access_url"]);
+		$access_key = db_escape_string( $_REQUEST["access_key"]);
 
-		db_query($this->link, "BEGIN");
+		db_query( "BEGIN");
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_linked_instances
+		$result = db_query( "SELECT id FROM ttrss_linked_instances
 			WHERE access_url = '$access_url'");
 
 		if (db_num_rows($result) == 0) {
-			db_query($this->link, "INSERT INTO ttrss_linked_instances
+			db_query( "INSERT INTO ttrss_linked_instances
 				(access_url, access_key, last_connected, last_status_in, last_status_out)
 				VALUES
 				('$access_url', '$access_key', '1970-01-01', -1, -1)");
 
 		}
 
-		db_query($this->link, "COMMIT");
+		db_query( "COMMIT");
 	}
 
 	function edit() {
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
+		$id = db_escape_string( $_REQUEST["id"]);
 
-		$result = db_query($this->link, "SELECT * FROM ttrss_linked_instances WHERE
+		$result = db_query( "SELECT * FROM ttrss_linked_instances WHERE
 			id = '$id'");
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"id\" value=\"$id\">";
@@ -253,11 +250,11 @@ class Instances extends Plugin implements IHandler {
 	}
 
 	function editSave() {
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
-		$access_url = db_escape_string($this->link, $_REQUEST["access_url"]);
-		$access_key = db_escape_string($this->link, $_REQUEST["access_key"]);
+		$id = db_escape_string( $_REQUEST["id"]);
+		$access_url = db_escape_string( $_REQUEST["access_url"]);
+		$access_key = db_escape_string( $_REQUEST["access_key"]);
 
-		db_query($this->link, "UPDATE ttrss_linked_instances SET
+		db_query( "UPDATE ttrss_linked_instances SET
 			access_key = '$access_key', access_url = '$access_url',
 			last_connected = '1970-01-01'
 			WHERE id = '$id'");
@@ -277,7 +274,7 @@ class Instances extends Plugin implements IHandler {
 
 		print "<div id=\"pref-instance-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-		$sort = db_escape_string($this->link, $_REQUEST["sort"]);
+		$sort = db_escape_string( $_REQUEST["sort"]);
 
 		if (!$sort || $sort == "undefined") {
 			$sort = "access_url";
@@ -298,7 +295,7 @@ class Instances extends Plugin implements IHandler {
 
 		print "</div>"; #toolbar
 
-		$result = db_query($this->link, "SELECT *,
+		$result = db_query( "SELECT *,
 			(SELECT COUNT(*) FROM ttrss_linked_feeds
 				WHERE instance_id = ttrss_linked_instances.id) AS num_feeds
 			FROM ttrss_linked_instances
@@ -327,7 +324,7 @@ class Instances extends Plugin implements IHandler {
 			$id = $line['id'];
 			$this_row_id = "id=\"LIRR-$id\"";
 
-			$line["last_connected"] = make_local_datetime($this->link, $line["last_connected"], false);
+			$line["last_connected"] = make_local_datetime( $line["last_connected"], false);
 
 			print "<tr class=\"$class\" $this_row_id>";
 
@@ -364,17 +361,17 @@ class Instances extends Plugin implements IHandler {
 
 	function fbexport() {
 
-		$access_key = db_escape_string($this->link, $_POST["key"]);
+		$access_key = db_escape_string( $_POST["key"]);
 
 		// TODO: rate limit checking using last_connected
-		$result = db_query($this->link, "SELECT id FROM ttrss_linked_instances
+		$result = db_query( "SELECT id FROM ttrss_linked_instances
 			WHERE access_key = '$access_key'");
 
 		if (db_num_rows($result) == 1) {
 
 			$instance_id = db_fetch_result($result, 0, "id");
 
-			$result = db_query($this->link, "SELECT feed_url, site_url, title, subscribers
+			$result = db_query( "SELECT feed_url, site_url, title, subscribers
 				FROM ttrss_feedbrowser_cache ORDER BY subscribers DESC LIMIT 100");
 
 			$feeds = array();
@@ -383,7 +380,7 @@ class Instances extends Plugin implements IHandler {
 				array_push($feeds, $line);
 			}
 
-			db_query($this->link, "UPDATE ttrss_linked_instances SET
+			db_query( "UPDATE ttrss_linked_instances SET
 				last_status_in = 1 WHERE id = '$instance_id'");
 
 			print json_encode(array("feeds" => $feeds));
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 574dc1ef3..7adf36fe4 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -1,7 +1,6 @@
 <?php
 class Mail extends Plugin {
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +10,6 @@ class Mail extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
@@ -30,13 +28,13 @@ class Mail extends Plugin {
 
 	function emailArticle() {
 
-		$param = db_escape_string($this->link, $_REQUEST['param']);
+		$param = db_escape_string( $_REQUEST['param']);
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"mail\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"sendEmail\">";
 
-		$result = db_query($this->link, "SELECT email, full_name FROM ttrss_users WHERE
+		$result = db_query( "SELECT email, full_name FROM ttrss_users WHERE
 			id = " . $_SESSION["uid"]);
 
 		$user_email = htmlspecialchars(db_fetch_result($result, 0, "email"));
@@ -58,7 +56,7 @@ class Mail extends Plugin {
 		$tpl->setVariable('USER_EMAIL', $user_email, true);
 		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
-		$result = db_query($this->link, "SELECT link, content, title
+		$result = db_query( "SELECT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
 
@@ -149,7 +147,7 @@ class Mail extends Plugin {
 		if (!$rc) {
 			$reply['error'] =  $mail->ErrorInfo;
 		} else {
-			save_email_address($this->link, db_escape_string($this->link, $destination));
+			save_email_address( db_escape_string($destination));
 			$reply['message'] = "UPDATE_COUNTERS";
 		}
 
@@ -157,7 +155,7 @@ class Mail extends Plugin {
 	}
 
 	function completeEmails() {
-		$search = db_escape_string($this->link, $_REQUEST["search"]);
+		$search = db_escape_string( $_REQUEST["search"]);
 
 		print "<ul>";
 
diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 6c7478b68..81b2758b8 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -1,7 +1,5 @@
 <?php
 class MailTo extends Plugin {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +9,6 @@ class MailTo extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
@@ -30,7 +27,7 @@ class MailTo extends Plugin {
 
 	function emailArticle() {
 
-		$param = db_escape_string($this->link, $_REQUEST['param']);
+		$param = db_escape_string( $_REQUEST['param']);
 
 		require_once "lib/MiniTemplator.class.php";
 
@@ -44,7 +41,7 @@ class MailTo extends Plugin {
 		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
 
-		$result = db_query($this->link, "SELECT link, content, title
+		$result = db_query( "SELECT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
 
diff --git a/plugins/mark_button/init.php b/plugins/mark_button/init.php
index 4cf1c5949..1ed2ea438 100644
--- a/plugins/mark_button/init.php
+++ b/plugins/mark_button/init.php
@@ -1,10 +1,8 @@
 <?php
 class Mark_Button extends Plugin {
-	private $link;
 	private $host;
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
@@ -20,7 +18,7 @@ class Mark_Button extends Plugin {
 		$marked_pic = "";
 		$id = $line["id"];
 
-		if (get_pref($this->link, "COMBINED_DISPLAY_MODE")) {
+		if (get_pref( "COMBINED_DISPLAY_MODE")) {
 			if (sql_bool_to_bool($line["marked"])) {
 				$marked_pic = "<img
 					src=\"images/mark_set.svg\"
diff --git a/plugins/mobile/article.php b/plugins/mobile/article.php
index c73c0fca5..17fc39395 100644
--- a/plugins/mobile/article.php
+++ b/plugins/mobile/article.php
@@ -20,13 +20,13 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 
-	$id = db_escape_string($link, $_REQUEST["id"]);
-	$feed_id = db_escape_string($link, $_REQUEST["feed"]);
-	$cat_id = db_escape_string($link, $_REQUEST["cat"]);
-	$is_cat = db_escape_string($link, $_REQUEST["is_cat"]);
+	$id = db_escape_string( $_REQUEST["id"]);
+	$feed_id = db_escape_string( $_REQUEST["feed"]);
+	$cat_id = db_escape_string( $_REQUEST["cat"]);
+	$is_cat = db_escape_string( $_REQUEST["is_cat"]);
 
-  	render_article($link, $id, $feed_id, $cat_id, $is_cat);
+  	render_article( $id, $feed_id, $cat_id, $is_cat);
 ?>
 
diff --git a/plugins/mobile/backend.php b/plugins/mobile/backend.php
index dc657ed40..a62f462d5 100644
--- a/plugins/mobile/backend.php
+++ b/plugins/mobile/backend.php
@@ -31,28 +31,28 @@
 
 	switch ($op) {
 	case "toggleMarked":
-		$cmode = db_escape_string($link, $_REQUEST["mark"]);
-		$id = db_escape_string($link, $_REQUEST["id"]);
+		$cmode = db_escape_string( $_REQUEST["mark"]);
+		$id = db_escape_string( $_REQUEST["id"]);
 
-		markArticlesById($link, array($id), $cmode);
+		markArticlesById( array($id), $cmode);
 		break;
 	case "togglePublished":
-		$cmode = db_escape_string($link, $_REQUEST["pub"]);
-		$id = db_escape_string($link, $_REQUEST["id"]);
+		$cmode = db_escape_string( $_REQUEST["pub"]);
+		$id = db_escape_string( $_REQUEST["id"]);
 
-		publishArticlesById($link, array($id), $cmode);
+		publishArticlesById( array($id), $cmode);
 		break;
 	case "toggleUnread":
-		$cmode = db_escape_string($link, $_REQUEST["unread"]);
-		$id = db_escape_string($link, $_REQUEST["id"]);
+		$cmode = db_escape_string( $_REQUEST["unread"]);
+		$id = db_escape_string( $_REQUEST["id"]);
 
-		catchupArticlesById($link, array($id), $cmode);
+		catchupArticlesById( array($id), $cmode);
 		break;
 
 	case "setPref":
-		$id = db_escape_string($link, $_REQUEST["id"]);
-		$value = db_escape_string($link, $_REQUEST["to"]);
-		mobile_set_pref($link, $id, $value);
+		$id = db_escape_string( $_REQUEST["id"]);
+		$value = db_escape_string( $_REQUEST["to"]);
+		mobile_set_pref( $id, $value);
 		print_r($_SESSION);
 		break;
 	default:
diff --git a/plugins/mobile/cat.php b/plugins/mobile/cat.php
index acd7f6f34..ec5bbf3d9 100644
--- a/plugins/mobile/cat.php
+++ b/plugins/mobile/cat.php
@@ -20,10 +20,10 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 
-	$cat_id = db_escape_string($link, $_REQUEST["id"]);
+	$cat_id = db_escape_string( $_REQUEST["id"]);
 
-  	render_category($link, $cat_id);
+  	render_category( $cat_id);
 ?>
 
diff --git a/plugins/mobile/feed.php b/plugins/mobile/feed.php
index 22590f195..08e916e21 100644
--- a/plugins/mobile/feed.php
+++ b/plugins/mobile/feed.php
@@ -20,14 +20,14 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 
-	$feed_id = db_escape_string($link, $_REQUEST["id"]);
-	$cat_id = db_escape_string($link, $_REQUEST["cat"]);
-	$offset = (int) db_escape_string($link, $_REQUEST["skip"]);
-	$search = db_escape_string($link, $_REQUEST["search"]);
-	$is_cat = (bool) db_escape_string($link, $_REQUEST["is_cat"]);
+	$feed_id = db_escape_string( $_REQUEST["id"]);
+	$cat_id = db_escape_string( $_REQUEST["cat"]);
+	$offset = (int) db_escape_string( $_REQUEST["skip"]);
+	$search = db_escape_string( $_REQUEST["search"]);
+	$is_cat = (bool) db_escape_string( $_REQUEST["is_cat"]);
 
-  	render_headlines_list($link, $feed_id, $cat_id, $offset, $search, $is_cat);
+  	render_headlines_list( $feed_id, $cat_id, $offset, $search, $is_cat);
 ?>
 
diff --git a/plugins/mobile/home.php b/plugins/mobile/home.php
index f0ebf6a11..57b18cd85 100644
--- a/plugins/mobile/home.php
+++ b/plugins/mobile/home.php
@@ -20,14 +20,14 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 
-	$use_cats = mobile_get_pref($link, 'ENABLE_CATS');
-	$offset = (int) db_escape_string($link, $_REQUEST["skip"]);
+	$use_cats = mobile_get_pref( 'ENABLE_CATS');
+	$offset = (int) db_escape_string( $_REQUEST["skip"]);
 
 	if ($use_cats) {
 		render_categories_list($link);
 	} else {
-		render_flat_feed_list($link, $offset);
+		render_flat_feed_list( $offset);
 	}
 ?>
diff --git a/plugins/mobile/index.php b/plugins/mobile/index.php
index 3fd496d04..8202f4043 100644
--- a/plugins/mobile/index.php
+++ b/plugins/mobile/index.php
@@ -20,7 +20,7 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -76,13 +76,13 @@
     </div>
 
 	<?php
-	$use_cats = mobile_get_pref($link, 'ENABLE_CATS');
-	$offset = (int) db_escape_string($link, $_REQUEST["skip"]);
+	$use_cats = mobile_get_pref( 'ENABLE_CATS');
+	$offset = (int) db_escape_string( $_REQUEST["skip"]);
 
 	if ($use_cats) {
 		render_categories_list($link);
 	} else {
-		render_flat_feed_list($link, $offset);
+		render_flat_feed_list( $offset);
 	}
 	?>
 
diff --git a/plugins/mobile/init.php b/plugins/mobile/init.php
index 0ebbcced1..ad2d1cdd9 100644
--- a/plugins/mobile/init.php
+++ b/plugins/mobile/init.php
@@ -1,7 +1,5 @@
 <?php
 class Mobile extends Plugin implements IHandler {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -12,7 +10,6 @@ class Mobile extends Plugin implements IHandler {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_handler("mobile", "index", $this);
diff --git a/plugins/mobile/mobile-functions.php b/plugins/mobile/mobile-functions.php
index 8e5cb7010..0395ee7a5 100644
--- a/plugins/mobile/mobile-functions.php
+++ b/plugins/mobile/mobile-functions.php
@@ -8,34 +8,34 @@
 
 	/* TODO replace with interface to db-prefs */
 
-	function mobile_pref_toggled($link, $id) {
-		if (get_pref($link, "_MOBILE_$id"))
+	function mobile_pref_toggled( $id) {
+		if (get_pref( "_MOBILE_$id"))
 			return "true";
 		else
 			return "";
 	}
 
-	function mobile_get_pref($link, $id) {
+	function mobile_get_pref( $id) {
 		//return $_SESSION["mobile-prefs"][$id];
-		return get_pref($link, "_MOBILE_$id");
+		return get_pref( "_MOBILE_$id");
 	}
 
-	function mobile_set_pref($link, $id, $value) {
+	function mobile_set_pref( $id, $value) {
 		//$_SESSION["mobile-prefs"][$id] = $value;
-		return set_pref($link, "_MOBILE_$id", $value);
+		return set_pref( "_MOBILE_$id", $value);
 	}
 
 	function mobile_feed_has_icon($id) {
 		return file_exists("../../".ICONS_DIR."/$id.ico");
 	}
 
-	function render_flat_feed_list($link, $offset) {
+	function render_flat_feed_list( $offset) {
 		$owner_uid = $_SESSION["uid"];
 		$limit = 0;
 
 		if (!$offset) $offset = 0;
 
-		if (mobile_get_pref($link, "SORT_FEEDS_UNREAD")) {
+		if (mobile_get_pref( "SORT_FEEDS_UNREAD")) {
 			$order_by = "unread DESC, title";
 		} else {
 			$order_by = "title";
@@ -47,7 +47,7 @@
 			$limit_qpart = "";
 		}
 
-		$result = db_query($link, "SELECT id,
+		$result = db_query( "SELECT id,
 				title,
 			(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
 				WHERE feed_id = ttrss_feeds.id AND unread = true
@@ -85,7 +85,7 @@
 					$icon_url = "../../images/blank_icon.gif";
 				}
 
-				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 					print "<li class='$class'><a href='feed.php?id=$id'>" .
 						"<img class='tinyIcon' src='$icon_url'/>".
 						$line["title"] . "</a></li>";
@@ -103,7 +103,7 @@
 
 	}
 
-	function render_category($link, $cat_id, $offset) {
+	function render_category( $cat_id, $offset) {
 		$owner_uid = $_SESSION["uid"];
 
 		if ($cat_id >= 0) {
@@ -114,13 +114,13 @@
 				$cat_query = "cat_id IS NULL";
 			}
 
-			if (mobile_get_pref($link, "SORT_FEEDS_UNREAD")) {
+			if (mobile_get_pref( "SORT_FEEDS_UNREAD")) {
 				$order_by = "unread DESC, title";
 			} else {
 				$order_by = "title";
 			}
 
-			$result = db_query($link, "SELECT id,
+			$result = db_query( "SELECT id,
 				title,
 			(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
 				WHERE feed_id = ttrss_feeds.id AND unread = true
@@ -132,7 +132,7 @@
 				$cat_query
 			ORDER BY $order_by");
 
-			$title = getCategoryTitle($link, $cat_id);
+			$title = getCategoryTitle( $cat_id);
 
 			print "<ul id='cat-$cat_id' title='$title' myBackLabel='".__("Home")."'
 				myBackHref='home.php'>";
@@ -158,7 +158,7 @@
 					$icon_url = "../../images/blank_icon.gif";
 				}
 
-				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 					print "<li class='$class'><a href='feed.php?id=$id&cat=$cat_id'>" .
 						"<img class='tinyIcon' src='$icon_url'/>".
 						$line["title"] . "</a></li>";
@@ -174,8 +174,8 @@
 				myBackHref='home.php'>";
 
 			foreach (array(-4, -3, -1, -2, 0) as $id) {
-				$title = getFeedTitle($link, $id);
-				$unread = getFeedUnread($link, $id, false);
+				$title = getFeedTitle( $id);
+				$unread = getFeedUnread( $id, false);
 				$icon = getFeedIcon($id);
 
 				if ($unread > 0) {
@@ -185,7 +185,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 					print "<li class='$class'>
 						<a href='feed.php?id=$id&cat=-1'>
 						<img class='tinyIcon' src='../$icon'/>$title</a></li>";
@@ -200,7 +200,7 @@
 			print "<ul id='cat--2' title='$title' myBackLabel='".__("Home")."'
 				myBackHref='home.php'>";
 
-			$result = db_query($link, "SELECT id, caption FROM ttrss_labels2
+			$result = db_query( "SELECT id, caption FROM ttrss_labels2
 				WHERE owner_uid = '$owner_uid'");
 
 			$label_data = array();
@@ -209,7 +209,7 @@
 
 				$id = label_to_feed_id($line["id"]);
 
-				$unread = getFeedUnread($link, $id);
+				$unread = getFeedUnread( $id);
 				$title = $line["caption"];
 
 				if ($unread > 0) {
@@ -219,7 +219,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 					print "<li class='$class'>
 						<a href='feed.php?id=$id&cat=-2'>$title</a></li>";
 				}
@@ -231,7 +231,7 @@
 	function render_categories_list($link) {
 		$owner_uid = $_SESSION["uid"];
 
-		$cat_browse = mobile_get_pref($link, "BROWSE_CATS");
+		$cat_browse = mobile_get_pref( "BROWSE_CATS");
 
 		print '<ul id="home" title="'.__('Home').'" selected="true"
 			myBackLabel="'.__('Logout').'" myBackHref="logout.php" myBackTarget="_self">';
@@ -239,8 +239,8 @@
 //		print "<li><a href='#searchForm'>Search...</a></li>";
 
 		foreach (array(-1, -2) as $id) {
-			$title = getCategoryTitle($link, $id);
-			$unread = getFeedUnread($link, $id, true);
+			$title = getCategoryTitle( $id);
+			$unread = getFeedUnread( $id, true);
 			if ($unread > 0) {
 				$title = $title . " ($unread)";
 				$class = '';
@@ -254,7 +254,7 @@
 				print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>$title</a></li>";
 		}
 
-		$result = db_query($link, "SELECT
+		$result = db_query( "SELECT
 				ttrss_feed_categories.id,
 				ttrss_feed_categories.title,
 				COUNT(ttrss_feeds.id) AS num_feeds
@@ -269,7 +269,7 @@
 
 			if ($line["num_feeds"] > 0) {
 
-				$unread = getFeedUnread($link, $line["id"], true);
+				$unread = getFeedUnread( $line["id"], true);
 				$id = $line["id"];
 
 				if ($unread > 0) {
@@ -279,7 +279,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 
 					if ($cat_browse)
 						print "<li class='$class'><a href='cat.php?id=$id'>" .
@@ -292,13 +292,13 @@
 		}
 
 
-		$result = db_query($link, "SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE
+		$result = db_query( "SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE
 			cat_id IS NULL and owner_uid = '$owner_uid'");
 
 		$num_feeds = db_fetch_result($result, 0, "nf");
 
 		if ($num_feeds > 0) {
-			$unread = getFeedUnread($link, 0, true);
+			$unread = getFeedUnread( 0, true);
 			$title = "Uncategorized";
 
 			if ($unread > 0) {
@@ -308,7 +308,7 @@
 				$class = 'oldItem';
 			}
 
-			if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+			if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 				if ($cat_browse)
 					print "<li class='$class'><a href='cat.php?id=0'>$title</a></li>";
 				else
@@ -320,14 +320,14 @@
 		print "</ul>";
 	}
 
-	function render_headlines_list($link, $feed_id, $cat_id, $offset, $search,
+	function render_headlines_list( $feed_id, $cat_id, $offset, $search,
 		$is_cat = false) {
 
 		$feed_id = $feed_id;
 		$limit = 15;
 		$filter = '';
 
-		if (!mobile_get_pref($link, "HIDE_READ"))
+		if (!mobile_get_pref( "HIDE_READ"))
 			$view_mode = "all_articles";
 		else
 			$view_mode = 'adaptive';
@@ -338,9 +338,9 @@
 			$search_mode = '';
 		}
 
-		$qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
+		$qfh_ret = queryFeedHeadlines( $feed_id, $limit,
 			$view_mode, $is_cat, $search, $search_mode,
-			"score DESC, date_entered ".(mobile_get_pref($link, 'REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset);
+			"score DESC, date_entered ".(mobile_get_pref( 'REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset);
 
 		$result = $qfh_ret[0];
 		$feed_title = $qfh_ret[1];
@@ -364,7 +364,7 @@
 			  </form>";
 
 			if ($cat_id) {
-				$cat_title = getCategoryTitle($link, $cat_id);
+				$cat_title = getCategoryTitle( $cat_id);
 
 				print "<ul id=\"feed-$feed_id\" title=\"$feed_title\" selected=\"true\"
 					myBackLabel='$cat_title' myBackHref='cat.php?id=$cat_id'>";
@@ -413,7 +413,7 @@
 //		print "<a target='_replace' href='feed.php?id=$feed_id&cat=$cat_id&skip=0'>Next $limit articles...</a>";
 
 		$next_offset = $offset + $num_headlines;
-		$num_unread = getFeedUnread($link, $feed_id, $is_cat);
+		$num_unread = getFeedUnread( $feed_id, $is_cat);
 
 		/* FIXME needs normal implementation */
 
@@ -435,7 +435,7 @@
 
 	}
 
-	function render_article($link, $id, $feed_id, $cat_id, $is_cat) {
+	function render_article( $id, $feed_id, $cat_id, $is_cat) {
 
 		$query = "SELECT title,link,content,feed_id,comments,int_id,
 			marked,unread,published,
@@ -445,33 +445,33 @@
 			WHERE	id = '$id' AND ref_id = id AND owner_uid = " .
 				$_SESSION["uid"] ;
 
-		$result = db_query($link, $query);
+		$result = db_query( $query);
 
 		if (db_num_rows($result) != 0) {
 
 			$line = db_fetch_assoc($result);
 
-			$tmp_result = db_query($link, "UPDATE ttrss_user_entries
+			$tmp_result = db_query( "UPDATE ttrss_user_entries
 				SET unread = false,last_read = NOW()
 				WHERE ref_id = '$id'
 				AND owner_uid = " . $_SESSION["uid"]);
 
-			$updated_fmt = make_local_datetime($link, $line['updated'], false);
+			$updated_fmt = make_local_datetime( $line['updated'], false);
 
 			$title = $line["title"];
 			$article_link = $line["link"];
 
 			if (!$is_cat)
-				$feed_title = getFeedTitle($link, $feed_id);
+				$feed_title = getFeedTitle( $feed_id);
 			else
-				$feed_title = getCategoryTitle($link, $feed_id);
+				$feed_title = getCategoryTitle( $feed_id);
 
 			print "<div class=\"panel\" id=\"article-$id\" title=\"$title\"
 				selected=\"true\"
 				myBackLabel='$feed_title' myBackHref='feed.php?id=$feed_id&cat=$cat_id&is_cat=$is_cat'>";
 
 			if ($line['feed_id'] != $feed_id) {
-				$real_feed_title = getFeedTitle($link, $line['feed_id']);
+				$real_feed_title = getFeedTitle( $line['feed_id']);
 				$real_feed_id = $line['feed_id'];
 				$feed_link = "(<a href=\"feed.php?id=$real_feed_id\">$real_feed_title</a>)";
 			}
@@ -497,10 +497,10 @@
 
 //			print "</fieldset>";
 
-			$content = sanitize($link, $line["content"]);
+			$content = sanitize( $line["content"]);
 			$content = preg_replace("/href=/i", "target=\"_blank\" href=", $content);
 
-			if (!mobile_get_pref($link, "SHOW_IMAGES")) {
+			if (!mobile_get_pref( "SHOW_IMAGES")) {
 				$content = preg_replace('/<img[^>]+>/is', '', $content);
 			}
 
diff --git a/plugins/mobile/prefs.php b/plugins/mobile/prefs.php
index e6d4a7b40..78b6e8a7b 100644
--- a/plugins/mobile/prefs.php
+++ b/plugins/mobile/prefs.php
@@ -22,7 +22,7 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 ?>
 
 <div class="panel" id="prefs" selected="yes" title="Preferences"
@@ -32,33 +32,33 @@
 
 <div class="row">
 	<label><?php echo __('Enable categories') ?></label>
-	<div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Browse categories like folders') ?></label>
-	<div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 
 <div class="row">
 	<label><?php echo __('Show images in posts') ?></label>
-	<div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Hide read articles and feeds') ?></label>
-	<div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Sort feeds by unread count') ?></label>
-	<div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Reverse headline order (oldest first)') ?></label>
-	<div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 </fieldset>
diff --git a/plugins/note/init.php b/plugins/note/init.php
index 7e8cfb57f..a5396e5a4 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -1,6 +1,5 @@
 <?php
 class Note extends Plugin {
-	private $link;
 	private $host;
 
 	function about() {
@@ -10,7 +9,6 @@ class Note extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
@@ -29,9 +27,9 @@ class Note extends Plugin {
 	}
 
 	function edit() {
-		$param = db_escape_string($this->link, $_REQUEST['param']);
+		$param = db_escape_string( $_REQUEST['param']);
 
-		$result = db_query($this->link, "SELECT note FROM ttrss_user_entries WHERE
+		$result = db_query( "SELECT note FROM ttrss_user_entries WHERE
 			ref_id = '$param' AND owner_uid = " . $_SESSION['uid']);
 
 		$note = db_fetch_result($result, 0, "note");
@@ -58,10 +56,10 @@ class Note extends Plugin {
 	}
 
 	function setNote() {
-		$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"])));
 
-		db_query($this->link, "UPDATE ttrss_user_entries SET note = '$note'
+		db_query( "UPDATE ttrss_user_entries SET note = '$note'
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
 		$formatted_note = format_article_note($id, $note);
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index 247d56a1e..92b5f65b2 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -1,7 +1,5 @@
 <?php
 class NSFW extends Plugin {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -12,7 +10,6 @@ class NSFW extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_RENDER_ARTICLE, $this);
@@ -91,7 +88,7 @@ class NSFW extends Plugin {
 	}
 
 	function save() {
-		$tags = explode(",", db_escape_string($this->link, $_POST["tags"]));
+		$tags = explode(",", db_escape_string( $_POST["tags"]));
 		$tags = array_map("trim", $tags);
 		$tags = array_map("mb_strtolower", $tags);
 		$tags = join(", ", $tags);
diff --git a/plugins/share/init.php b/plugins/share/init.php
index 4d7e0437c..b9e030d37 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -1,6 +1,5 @@
 <?php
 class Share extends Plugin {
-	private $link;
 	private $host;
 
 	function about() {
@@ -10,7 +9,6 @@ class Share extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
@@ -28,9 +26,9 @@ class Share extends Plugin {
 	}
 
 	function shareArticle() {
-		$param = db_escape_string($this->link, $_REQUEST['param']);
+		$param = db_escape_string( $_REQUEST['param']);
 
-		$result = db_query($this->link, "SELECT uuid, ref_id FROM ttrss_user_entries WHERE int_id = '$param'
+		$result = db_query( "SELECT uuid, ref_id FROM ttrss_user_entries WHERE int_id = '$param'
 			AND owner_uid = " . $_SESSION['uid']);
 
 		if (db_num_rows($result) == 0) {
@@ -41,8 +39,8 @@ class Share extends Plugin {
 			$ref_id = db_fetch_result($result, 0, "ref_id");
 
 			if (!$uuid) {
-				$uuid = db_escape_string($this->link, sha1(uniqid(rand(), true)));
-				db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param'
+				$uuid = db_escape_string( sha1(uniqid(rand(), true)));
+				db_query( "UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param'
 					AND owner_uid = " . $_SESSION['uid']);
 			}
 
@@ -55,10 +53,10 @@ class Share extends Plugin {
 			print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
 			print "</div>";
 
-			/* if (!label_find_id($this->link, __('Shared'), $_SESSION["uid"]))
-				label_create($this->link, __('Shared'), $_SESSION["uid"]);
+			/* if (!label_find_id( __('Shared'), $_SESSION["uid"]))
+				label_create( __('Shared'), $_SESSION["uid"]);
 
-			label_add_article($this->link, $ref_id, __('Shared'), $_SESSION['uid']); */
+			label_add_article( $ref_id, __('Shared'), $_SESSION['uid']); */
 		}
 
 		print "<div align='center'>";
diff --git a/plugins/swap_jk/init.php b/plugins/swap_jk/init.php
index 34b09bd77..73fb82007 100644
--- a/plugins/swap_jk/init.php
+++ b/plugins/swap_jk/init.php
@@ -1,7 +1,6 @@
 <?php
 class Swap_JK extends Plugin {
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +10,6 @@ class Swap_JK extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_HOTKEY_MAP, $this);
diff --git a/plugins/updater/init.php b/plugins/updater/init.php
index 6bfaa82c4..856a0cbf9 100644
--- a/plugins/updater/init.php
+++ b/plugins/updater/init.php
@@ -1,7 +1,6 @@
 <?php
 class Updater extends Plugin {
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -12,7 +11,6 @@ class Updater extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_PREFS_TAB, $this);
@@ -22,7 +20,7 @@ class Updater extends Plugin {
 			$this);
 	}
 
-	function update_self_step($link, $step, $params, $force = false) {
+	function update_self_step( $step, $params, $force = false) {
 		// __FILE__ is in plugins/updater so we need to go one level up
 		$work_dir = dirname(dirname(dirname(__FILE__)));
 		$parent_dir = dirname($work_dir);
@@ -279,13 +277,13 @@ class Updater extends Plugin {
 		return array("step" => $step, "stop" => $stop, "params" => $params, "log" => $log);
 	}
 
-	function update_self_cli($link, $force = false) {
+	function update_self_cli( $force = false) {
 		$step = 0;
 		$stop = false;
 		$params = array();
 
 		while (!$stop) {
-			$rc = $this->update_self_step($link, $step, $params, $force);
+			$rc = $this->update_self_step( $step, $params, $force);
 
 			$params = $rc['params'];
 			$stop = $rc['stop'];
@@ -309,7 +307,7 @@ class Updater extends Plugin {
 		if ($input != 'yes' && $input != 'force')
 			exit;
 
-		$this->update_self_cli($link, $input == 'force');
+		$this->update_self_cli( $input == 'force');
 	}
 
 	function get_prefs_js() {
@@ -323,7 +321,7 @@ class Updater extends Plugin {
 			print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Update Tiny Tiny RSS')."\">";
 
 			if ($_SESSION["pref_last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
-				$_SESSION["version_data"] = @check_for_update($this->link);
+				$_SESSION["version_data"] = @check_for_update();
 				$_SESSION["pref_last_version_check"] = time();
 			}
 
@@ -378,7 +376,7 @@ class Updater extends Plugin {
 		$force = (bool) $_REQUEST["force"];
 
 		if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) {
-			print	json_encode($this->update_self_step($this->link, $step, $params, $force));
+			print	json_encode($this->update_self_step( $step, $params, $force));
 		}
 	}
 
diff --git a/prefs.php b/prefs.php
index 7a7d2842c..54d5ebad8 100644
--- a/prefs.php
+++ b/prefs.php
@@ -22,9 +22,9 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_plugins($link)) return;
+	if (!init_plugins()) return;
 
-	login_sequence($link);
+	login_sequence();
 
 	header('Content-Type: text/html; charset=utf-8');
 ?>
@@ -39,14 +39,14 @@
 	<?php echo stylesheet_tag("prefs.css"); ?>
 
 	<?php if ($_SESSION["uid"]) {
-		$theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
+		$theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
 		if ($theme) {
 			echo stylesheet_tag("themes/$theme");
 		}
 	}
 	?>
 
-	<?php print_user_stylesheet($link) ?>
+	<?php print_user_stylesheet() ?>
 
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 	<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" />
@@ -154,7 +154,7 @@
 
 </div>
 
-<?php db_close($link); ?>
+<?php db_close(); ?>
 
 </body>
 </html>
diff --git a/public.php b/public.php
index ae6ae44b2..fa8ea29b8 100644
--- a/public.php
+++ b/public.php
@@ -31,7 +31,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_plugins($link)) return;
+	if (!init_plugins()) return;
 
 	if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
 		ob_start("ob_gzhandler");
@@ -45,7 +45,7 @@
 	if ($override) {
 		$handler = $override;
 	} else {
-		$handler = new Handler_Public($link, $_REQUEST);
+		$handler = new Handler_Public( $_REQUEST);
 	}
 
 	if (implements_interface($handler, "IHandler") && $handler->before($method)) {
@@ -62,5 +62,5 @@
 	print json_encode(array("error" => array("code" => 7)));
 
 	// We close the connection to database.
-	db_close($link);
+	db_close();
 ?>
diff --git a/register.php b/register.php
index d7c60d4f0..a8fdb483a 100644
--- a/register.php
+++ b/register.php
@@ -19,7 +19,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_plugins($link)) return;
+	if (!init_plugins()) return;
 
 	if ($_REQUEST["format"] == "feed") {
 		header("Content-Type: text/xml");
@@ -32,7 +32,7 @@
 			<link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH)."\"/>";
 
 		if (ENABLE_REGISTRATION) {
-			$result = db_query($link, "SELECT COUNT(*) AS cu FROM ttrss_users");
+			$result = db_query( "SELECT COUNT(*) AS cu FROM ttrss_users");
 			$num_users = db_fetch_result($result, 0, "cu");
 
 			$num_users = REG_MAX_USERS - $num_users;
@@ -60,10 +60,10 @@
 	/* Remove users which didn't login after receiving their registration information */
 
 	if (DB_TYPE == "pgsql") {
-		db_query($link, "DELETE FROM ttrss_users WHERE last_login IS NULL
+		db_query( "DELETE FROM ttrss_users WHERE last_login IS NULL
 				AND created < NOW() - INTERVAL '1 day' AND access_level = 0");
 	} else {
-		db_query($link, "DELETE FROM ttrss_users WHERE last_login IS NULL
+		db_query( "DELETE FROM ttrss_users WHERE last_login IS NULL
 				AND created < DATE_SUB(NOW(), INTERVAL 1 DAY) AND access_level = 0");
 	}
 
@@ -74,9 +74,9 @@
 	if ($action == "check") {
 		header("Content-Type: application/xml");
 
-		$login = trim(db_escape_string($link, $_REQUEST['login']));
+		$login = trim(db_escape_string( $_REQUEST['login']));
 
-		$result = db_query($link, "SELECT id FROM ttrss_users WHERE
+		$result = db_query( "SELECT id FROM ttrss_users WHERE
 			LOWER(login) = LOWER('$login')");
 
 		$is_registered = db_num_rows($result) > 0;
@@ -200,7 +200,7 @@
 ?>
 
 <?php if (REG_MAX_USERS > 0) {
-		$result = db_query($link, "SELECT COUNT(*) AS cu FROM ttrss_users");
+		$result = db_query( "SELECT COUNT(*) AS cu FROM ttrss_users");
 		$num_users = db_fetch_result($result, 0, "cu");
 } ?>
 
@@ -244,9 +244,9 @@
 	<?php } else if ($action == "do_register") { ?>
 
 	<?php
-		$login = mb_strtolower(trim(db_escape_string($link, $_REQUEST["login"])));
-		$email = trim(db_escape_string($link, $_REQUEST["email"]));
-		$test = trim(db_escape_string($link, $_REQUEST["turing_test"]));
+		$login = mb_strtolower(trim(db_escape_string( $_REQUEST["login"])));
+		$email = trim(db_escape_string( $_REQUEST["email"]));
+		$test = trim(db_escape_string( $_REQUEST["turing_test"]));
 
 		if (!$login || !$email || !$test) {
 			print_error(__("Your registration information is incomplete."));
@@ -258,7 +258,7 @@
 
 		if ($test == "four" || $test == "4") {
 
-			$result = db_query($link, "SELECT id FROM ttrss_users WHERE
+			$result = db_query( "SELECT id FROM ttrss_users WHERE
 				login = '$login'");
 
 			$is_registered = db_num_rows($result) > 0;
@@ -275,11 +275,11 @@
 				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 				$pwd_hash = encrypt_password($password, $salt, true);
 
-				db_query($link, "INSERT INTO ttrss_users
+				db_query( "INSERT INTO ttrss_users
 					(login,pwd_hash,access_level,last_login, email, created, salt)
 					VALUES ('$login', '$pwd_hash', 0, null, '$email', NOW(), '$salt')");
 
-				$result = db_query($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) {
@@ -291,7 +291,7 @@
 
 					$new_uid = db_fetch_result($result, 0, "id");
 
-					initialize_user($link, $new_uid);
+					initialize_user( $new_uid);
 
 					$reg_text = "Hi!\n".
 						"\n".
diff --git a/update.php b/update.php
index d9009f965..abbe6c577 100755
--- a/update.php
+++ b/update.php
@@ -19,10 +19,7 @@
 	if (!defined('PHP_EXECUTABLE'))
 		define('PHP_EXECUTABLE', '/usr/bin/php');
 
-	// Create a database connection.
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	init_plugins($link);
+	init_plugins();
 
 	$longopts = array("feeds",
 			"feedbrowser",
@@ -91,7 +88,7 @@
 	}
 
 	if (!isset($options['update-schema'])) {
-		$schema_version = get_schema_version($link);
+		$schema_version = get_schema_version();
 
 		if ($schema_version != SCHEMA_VERSION) {
 			die("Schema version is wrong, please upgrade the database.\n");
@@ -128,22 +125,22 @@
 	if (isset($options["force-update"])) {
 		_debug("marking all feeds as needing update...");
 
-		db_query($link, "UPDATE ttrss_feeds SET last_update_started = '1970-01-01',
+		db_query( "UPDATE ttrss_feeds SET last_update_started = '1970-01-01',
 				last_updated = '1970-01-01'");
 	}
 
 	if (isset($options["feeds"])) {
 		// Update all feeds needing a update.
-		update_daemon_common($link);
+		update_daemon_common();
 
 		// Update feedbrowser
-		$count = update_feedbrowser_cache($link);
+		$count = update_feedbrowser_cache();
 		_debug("Feedbrowser updated, $count feeds processed.");
 
 		// Purge orphans and cleanup tags
-		purge_orphans($link, true);
+		purge_orphans( true);
 
-		$rc = cleanup_tags($link, 14, 50000);
+		$rc = cleanup_tags( 14, 50000);
 		_debug("Cleaned $rc cached tags.");
 
 		global $pluginhost;
@@ -151,7 +148,7 @@
 	}
 
 	if (isset($options["feedbrowser"])) {
-		$count = update_feedbrowser_cache($link);
+		$count = update_feedbrowser_cache();
 		print "Finished, $count feeds processed.\n";
 	}
 
@@ -174,14 +171,14 @@
 		// or regenerate feedbrowser cache
 
 		if (rand(0,100) > 30) {
-			update_daemon_common($link);
+			update_daemon_common();
 		} else {
-			$count = update_feedbrowser_cache($link);
+			$count = update_feedbrowser_cache();
 			_debug("Feedbrowser updated, $count feeds processed.");
 
-			purge_orphans($link, true);
+			purge_orphans( true);
 
-			$rc = cleanup_tags($link, 14, 50000);
+			$rc = cleanup_tags( 14, 50000);
 
 			_debug("Cleaned $rc cached tags.");
 
@@ -192,7 +189,7 @@
 	}
 
 	if (isset($options["cleanup-tags"])) {
-		$rc = cleanup_tags($link, 14, 50000);
+		$rc = cleanup_tags( 14, 50000);
 		_debug("$rc tags deleted.\n");
 	}
 
@@ -206,12 +203,12 @@
 		_debug("clearing existing indexes...");
 
 		if (DB_TYPE == "pgsql") {
-			$result = db_query($link, "SELECT relname FROM
+			$result = db_query( "SELECT relname FROM
 				pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
 					AND relname NOT LIKE '%_pkey'
 				AND relkind = 'i'");
 		} else {
-			$result = db_query($link, "SELECT index_name,table_name FROM
+			$result = db_query( "SELECT index_name,table_name FROM
 				information_schema.statistics WHERE index_name LIKE 'ttrss_%'");
 		}
 
@@ -224,7 +221,7 @@
 					$line['table_name']." DROP INDEX ".$line['index_name'];
 				_debug($statement);
 			}
-			db_query($link, $statement, false);
+			db_query( $statement, false);
 		}
 
 		_debug("reading indexes from schema for: " . DB_TYPE);
@@ -241,7 +238,7 @@
 					$statement = "CREATE INDEX $index ON $table";
 
 					_debug($statement);
-					db_query($link, $statement);
+					db_query( $statement);
 				}
 			}
 			fclose($fp);
@@ -260,9 +257,9 @@
 
 		_debug("converting filters...");
 
-		db_query($link, "DELETE FROM ttrss_filters2");
+		db_query( "DELETE FROM ttrss_filters2");
 
-		$result = db_query($link, "SELECT * FROM ttrss_filters ORDER BY id");
+		$result = db_query( "SELECT * FROM ttrss_filters ORDER BY id");
 
 		while ($line = db_fetch_assoc($result)) {
 			$owner_uid = $line["owner_uid"];
@@ -295,7 +292,7 @@
 				$_REQUEST = $filter;
 				$_SESSION["uid"] = $owner_uid;
 
-				$filters = new Pref_Filters($link, $_REQUEST);
+				$filters = new Pref_Filters( $_REQUEST);
 				$filters->add();
 			}
 		}
@@ -305,7 +302,7 @@
 	if (isset($options["update-schema"])) {
 		_debug("checking for updates (" . DB_TYPE . ")...");
 
-		$updater = new DbUpdater($link, DB_TYPE, SCHEMA_VERSION);
+		$updater = new DbUpdater( DB_TYPE, SCHEMA_VERSION);
 
 		if ($updater->isUpdateRequired()) {
 			_debug("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
@@ -332,7 +329,7 @@
 	}
 
 	if (isset($options["list-plugins"])) {
-		$tmppluginhost = new PluginHost($link);
+		$tmppluginhost = new PluginHost();
 		$tmppluginhost->load_all($tmppluginhost::KIND_ALL);
 		$enabled = array_map("trim", explode(",", PLUGINS));
 
@@ -355,8 +352,6 @@
 
 	$pluginhost->run_commands($options);
 
-	db_close($link);
-
 	if ($lock_handle != false) {
 		fclose($lock_handle);
 	}
diff --git a/update_daemon2.php b/update_daemon2.php
index 6d13add00..f5e031c9e 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -174,15 +174,11 @@
 			"Maybe another daemon is already running.\n");
 	}
 
-	// Testing database connection.
-	// It is unnecessary to start the fork loop if database is not ok.
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+	init_plugins();
 
-	if (!init_plugins($link)) die("Can't initialize db connection.\n");
+	$schema_version = get_schema_version();
 
-	$schema_version = get_schema_version($link);
-
-	db_close($link);
+	db_close();
 
 	if ($schema_version != SCHEMA_VERSION) {
 		die("Schema version is wrong, please upgrade the database.\n");
@@ -203,10 +199,8 @@
 
 			/* Check if schema version changed */
 
-			$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-			if (!init_plugins($link)) die("Can't initialize db connection.\n");
-			$test_schema_version = get_schema_version($link);
-			db_close($link);
+			init_plugins();
+			$test_schema_version = get_schema_version();
 
 			if ($test_schema_version != $schema_version) {
 				echo "Expected schema version: $schema_version, got: $test_schema_version\n";
@@ -254,9 +248,7 @@
 
 					$start_timestamp = time();
 
-					$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-					if (!init_plugins($link)) return;
+					if (!init_plugins()) return;
 
 					// We disable stamp file, since it is of no use in a multiprocess update.
 					// not really, tho for the time being -fox
@@ -271,15 +263,15 @@
 
 					_debug("Waiting before update [$j]..");
 					sleep($j*5);
-					$nf = update_daemon_common($link);
+					$nf = update_daemon_common();
 
 					if (rand(0,100) > 50) {
-						$count = update_feedbrowser_cache($link);
+						$count = update_feedbrowser_cache();
 						_debug("Feedbrowser updated, $count feeds processed.");
 
-						purge_orphans($link, true);
+						purge_orphans( true);
 
-						$rc = cleanup_tags($link, 14, 50000);
+						$rc = cleanup_tags( 14, 50000);
 
 						_debug("Cleaned $rc cached tags.");
 
@@ -297,7 +289,7 @@
 						}
 					}
 
-					db_close($link);
+					db_close();
 
 					// We are in a fork.
 					// We wait a little before exiting to avoid to be faster than our parent process.
-- 
cgit v1.2.3-54-g00ecf


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 +-
 include/ccache.php                  |  78 +++---
 include/colors.php                  |  18 +-
 include/db-prefs.php                |  18 +-
 include/db.php                      |   6 +-
 include/digest.php                  |  26 +-
 include/feedbrowser.php             |   8 +-
 include/functions.php               | 468 ++++++++++++++++++------------------
 include/labels.php                  |  70 +++---
 include/rssfuncs.php                | 190 +++++++--------
 include/sanity_check.php            |   2 +-
 include/sanity_config.php           |   2 +-
 plugins/auth_internal/init.php      |  24 +-
 plugins/auth_remote/init.php        |  18 +-
 plugins/close_button/init.php       |   2 +-
 plugins/digest/init.php             |  20 +-
 plugins/embed_original/init.php     |   4 +-
 plugins/example/init.php            |   2 +-
 plugins/example_vfeed/init.php      |   2 +-
 plugins/googlereaderimport/init.php |  46 ++--
 plugins/import_export/init.php      |  40 +--
 plugins/instances/init.php          |  66 ++---
 plugins/mail/init.php               |  10 +-
 plugins/mailto/init.php             |   4 +-
 plugins/mark_button/init.php        |   2 +-
 plugins/mobile/article.php          |  12 +-
 plugins/mobile/backend.php          |  24 +-
 plugins/mobile/cat.php              |   6 +-
 plugins/mobile/feed.php             |  14 +-
 plugins/mobile/home.php             |   8 +-
 plugins/mobile/index.php            |   8 +-
 plugins/mobile/mobile-functions.php |  90 +++----
 plugins/mobile/prefs.php            |  14 +-
 plugins/note/init.php               |  10 +-
 plugins/nsfw/init.php               |   2 +-
 plugins/share/init.php              |  14 +-
 plugins/updater/init.php            |  10 +-
 56 files changed, 1399 insertions(+), 1399 deletions(-)

(limited to 'include/functions.php')

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;
 	}
 
diff --git a/include/ccache.php b/include/ccache.php
index 10e70ffe3..d89b9efe0 100644
--- a/include/ccache.php
+++ b/include/ccache.php
@@ -1,19 +1,19 @@
 <?php
-	/* function ccache_zero( $feed_id, $owner_uid) {
-		db_query( "UPDATE ttrss_counters_cache SET
+	/* function ccache_zero($feed_id, $owner_uid) {
+		db_query("UPDATE ttrss_counters_cache SET
 			value = 0, updated = NOW() WHERE
 			feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
 	} */
 
-	function ccache_zero_all( $owner_uid) {
-		db_query( "UPDATE ttrss_counters_cache SET
+	function ccache_zero_all($owner_uid) {
+		db_query("UPDATE ttrss_counters_cache SET
 			value = 0 WHERE owner_uid = '$owner_uid'");
 
-		db_query( "UPDATE ttrss_cat_counters_cache SET
+		db_query("UPDATE ttrss_cat_counters_cache SET
 			value = 0 WHERE owner_uid = '$owner_uid'");
 	}
 
-	function ccache_remove( $feed_id, $owner_uid, $is_cat = false) {
+	function ccache_remove($feed_id, $owner_uid, $is_cat = false) {
 
 		if (!$is_cat) {
 			$table = "ttrss_counters_cache";
@@ -21,39 +21,39 @@
 			$table = "ttrss_cat_counters_cache";
 		}
 
-		db_query( "DELETE FROM $table WHERE
+		db_query("DELETE FROM $table WHERE
 			feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
 
 	}
 
-	function ccache_update_all( $owner_uid) {
+	function ccache_update_all($owner_uid) {
 
-		if (get_pref( 'ENABLE_FEED_CATS', $owner_uid)) {
+		if (get_pref('ENABLE_FEED_CATS', $owner_uid)) {
 
-			$result = db_query( "SELECT feed_id FROM ttrss_cat_counters_cache
+			$result = db_query("SELECT feed_id FROM ttrss_cat_counters_cache
 				WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
 
 			while ($line = db_fetch_assoc($result)) {
-				ccache_update( $line["feed_id"], $owner_uid, true);
+				ccache_update($line["feed_id"], $owner_uid, true);
 			}
 
 			/* We have to manually include category 0 */
 
-			ccache_update( 0, $owner_uid, true);
+			ccache_update(0, $owner_uid, true);
 
 		} else {
-			$result = db_query( "SELECT feed_id FROM ttrss_counters_cache
+			$result = db_query("SELECT feed_id FROM ttrss_counters_cache
 				WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
 
 			while ($line = db_fetch_assoc($result)) {
-				print ccache_update( $line["feed_id"], $owner_uid);
+				print ccache_update($line["feed_id"], $owner_uid);
 
 			}
 
 		}
 	}
 
-	function ccache_find( $feed_id, $owner_uid, $is_cat = false,
+	function ccache_find($feed_id, $owner_uid, $is_cat = false,
 		$no_update = false) {
 
 		if (!is_numeric($feed_id)) return;
@@ -61,7 +61,7 @@
 		if (!$is_cat) {
 			$table = "ttrss_counters_cache";
 			/* if ($feed_id > 0) {
-				$tmp_result = db_query( "SELECT owner_uid FROM ttrss_feeds
+				$tmp_result = db_query("SELECT owner_uid FROM ttrss_feeds
 					WHERE id = '$feed_id'");
 				$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
 			} */
@@ -75,7 +75,7 @@
 			$date_qpart = "updated > DATE_SUB(NOW(), INTERVAL 15 MINUTE)";
 		}
 
-		$result = db_query( "SELECT value FROM $table
+		$result = db_query("SELECT value FROM $table
 			WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id'
 			LIMIT 1");
 
@@ -85,30 +85,30 @@
 			if ($no_update) {
 				return -1;
 			} else {
-				return ccache_update( $feed_id, $owner_uid, $is_cat);
+				return ccache_update($feed_id, $owner_uid, $is_cat);
 			}
 		}
 
 	}
 
-	function ccache_update( $feed_id, $owner_uid, $is_cat = false,
+	function ccache_update($feed_id, $owner_uid, $is_cat = false,
 		$update_pcat = true) {
 
 		if (!is_numeric($feed_id)) return;
 
 		/* if (!$is_cat && $feed_id > 0) {
-			$tmp_result = db_query( "SELECT owner_uid FROM ttrss_feeds
+			$tmp_result = db_query("SELECT owner_uid FROM ttrss_feeds
 				WHERE id = '$feed_id'");
 			$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
 		} */
 
-		$prev_unread = ccache_find( $feed_id, $owner_uid, $is_cat, true);
+		$prev_unread = ccache_find($feed_id, $owner_uid, $is_cat, true);
 
 		/* When updating a label, all we need to do is recalculate feed counters
 		 * because labels are not cached */
 
 		if ($feed_id < 0) {
-			ccache_update_all( $owner_uid);
+			ccache_update_all($owner_uid);
 			return;
 		}
 
@@ -127,14 +127,14 @@
 
 			/* Recalculate counters for child feeds */
 
-			$result = db_query( "SELECT id FROM ttrss_feeds
+			$result = db_query("SELECT id FROM ttrss_feeds
 						WHERE owner_uid = '$owner_uid' AND $cat_qpart");
 
 			while ($line = db_fetch_assoc($result)) {
-				ccache_update( $line["id"], $owner_uid, false, false);
+				ccache_update($line["id"], $owner_uid, false, false);
 			}
 
-			$result = db_query( "SELECT SUM(value) AS sv
+			$result = db_query("SELECT SUM(value) AS sv
 				FROM ttrss_counters_cache, ttrss_feeds
 				WHERE id = feed_id AND $cat_qpart AND
 				ttrss_feeds.owner_uid = '$owner_uid'");
@@ -142,27 +142,27 @@
 			$unread = (int) db_fetch_result($result, 0, "sv");
 
 		} else {
-			$unread = (int) getFeedArticles( $feed_id, $is_cat, true, $owner_uid);
+			$unread = (int) getFeedArticles($feed_id, $is_cat, true, $owner_uid);
 		}
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
-		$result = db_query( "SELECT feed_id FROM $table
+		$result = db_query("SELECT feed_id FROM $table
 			WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id' LIMIT 1");
 
 		if (db_num_rows($result) == 1) {
-			db_query( "UPDATE $table SET
+			db_query("UPDATE $table SET
 				value = '$unread', updated = NOW() WHERE
 				feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
 
 		} else {
-			db_query( "INSERT INTO $table
+			db_query("INSERT INTO $table
 				(feed_id, value, owner_uid, updated)
 				VALUES
 				($feed_id, $unread, $owner_uid, NOW())");
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 
 		if ($feed_id > 0 && $prev_unread != $unread) {
 
@@ -172,36 +172,36 @@
 
 				if ($update_pcat) {
 
-					$result = db_query( "SELECT cat_id FROM ttrss_feeds
+					$result = db_query("SELECT cat_id FROM ttrss_feeds
 						WHERE owner_uid = '$owner_uid' AND id = '$feed_id'");
 
 					$cat_id = (int) db_fetch_result($result, 0, "cat_id");
 
-					ccache_update( $cat_id, $owner_uid, true);
+					ccache_update($cat_id, $owner_uid, true);
 
 				}
 			}
 		} else if ($feed_id < 0) {
-			ccache_update_all( $owner_uid);
+			ccache_update_all($owner_uid);
 		}
 
 		return $unread;
 	}
 
-	/* function ccache_cleanup( $owner_uid) {
+	/* function ccache_cleanup($owner_uid) {
 
 		if (DB_TYPE == "pgsql") {
-			db_query( "DELETE FROM ttrss_counters_cache AS c1 WHERE
+			db_query("DELETE FROM ttrss_counters_cache AS c1 WHERE
 				(SELECT count(*) FROM ttrss_counters_cache AS c2
 					WHERE c1.feed_id = c2.feed_id AND c2.owner_uid = c1.owner_uid) > 1
 					AND owner_uid = '$owner_uid'");
 
-			db_query( "DELETE FROM ttrss_cat_counters_cache AS c1 WHERE
+			db_query("DELETE FROM ttrss_cat_counters_cache AS c1 WHERE
 				(SELECT count(*) FROM ttrss_cat_counters_cache AS c2
 					WHERE c1.feed_id = c2.feed_id AND c2.owner_uid = c1.owner_uid) > 1
 					AND owner_uid = '$owner_uid'");
 		} else {
-			db_query( "DELETE c1 FROM
+			db_query("DELETE c1 FROM
 					ttrss_counters_cache AS c1,
 					ttrss_counters_cache AS c2
 				WHERE
@@ -209,7 +209,7 @@
 					c1.owner_uid = c2.owner_uid AND
 					c1.feed_id = c2.feed_id");
 
-			db_query( "DELETE c1 FROM
+			db_query("DELETE c1 FROM
 					ttrss_cat_counters_cache AS c1,
 					ttrss_cat_counters_cache AS c2
 				WHERE
diff --git a/include/colors.php b/include/colors.php
index 1359b9e2d..b20c34c41 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -237,13 +237,13 @@ function rgb2hsl($arr) {
    } else {
       $s = $del_Max / $var_Max;
 
-      $del_R = ( ( ( $max - $var_R ) / 6 ) + ( $del_Max / 2 ) ) / $del_Max;
-      $del_G = ( ( ( $max - $var_G ) / 6 ) + ( $del_Max / 2 ) ) / $del_Max;
-      $del_B = ( ( ( $max - $var_B ) / 6 ) + ( $del_Max / 2 ) ) / $del_Max;
+      $del_R = ((($max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_G = ((($max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_B = ((($max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 
       if      ($var_R == $var_Max) $h = $del_B - $del_G;
-      else if ($var_G == $var_Max) $h = ( 1 / 3 ) + $del_R - $del_B;
-      else if ($var_B == $var_Max) $h = ( 2 / 3 ) + $del_G - $del_R;
+      else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
+      else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
 
       if ($H < 0) $h++;
       if ($H > 1) $h--;
@@ -261,10 +261,10 @@ function hsl2rgb($arr) {
         $r = $g = $B = $v * 255;
     } else {
         $var_H = $h * 6;
-        $var_i = floor( $var_H );
-        $var_1 = $v * ( 1 - $s );
-        $var_2 = $v * ( 1 - $s * ( $var_H - $var_i ) );
-        $var_3 = $v * ( 1 - $s * (1 - ( $var_H - $var_i ) ) );
+        $var_i = floor($var_H );
+        $var_1 = $v * (1 - $s );
+        $var_2 = $v * (1 - $s * ($var_H - $var_i ) );
+        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
 
         if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
         else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
diff --git a/include/db-prefs.php b/include/db-prefs.php
index d786e5349..125f1caaa 100644
--- a/include/db-prefs.php
+++ b/include/db-prefs.php
@@ -21,7 +21,7 @@
 
 		if (get_schema_version() < 63) $profile_qpart = "";
 
-		$result = db_query( "SELECT
+		$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
@@ -42,9 +42,9 @@
 		}
 	}
 
-	function get_pref( $pref_name, $user_id = false, $die_on_error = false) {
+	function get_pref($pref_name, $user_id = false, $die_on_error = false) {
 
-		$pref_name = db_escape_string( $pref_name);
+		$pref_name = db_escape_string($pref_name);
 		$prefs_cache = true;
 		$profile = false;
 
@@ -71,7 +71,7 @@
 
 		if (get_schema_version() < 63) $profile_qpart = "";
 
-		$result = db_query( "SELECT
+		$result = db_query("SELECT
 			value,ttrss_prefs_types.type_name as type_name
 			FROM
 				ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
@@ -114,9 +114,9 @@
 		}
 	}
 
-	function set_pref( $pref_name, $value, $user_id = false, $strip_tags = true) {
-		$pref_name = db_escape_string( $pref_name);
-		$value = db_escape_string( $value, $strip_tags);
+	function set_pref($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"];
@@ -145,7 +145,7 @@
 		}
 
 		if (!$type_name) {
-			$result = db_query( "SELECT 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");
 
@@ -170,7 +170,7 @@
 				$value = 'UTC';
 			}
 
-			db_query( "UPDATE ttrss_user_prefs SET
+			db_query("UPDATE ttrss_user_prefs SET
 				value = '$value' WHERE pref_name = '$pref_name'
 					$profile_qpart
 					AND owner_uid = " . $_SESSION["uid"]);
diff --git a/include/db.php b/include/db.php
index 72c78474a..55d1d654e 100644
--- a/include/db.php
+++ b/include/db.php
@@ -1,10 +1,10 @@
 <?php
 
-function db_escape_string( $s, $strip_tags = true) {
+function db_escape_string($s, $strip_tags = true) {
 	return Db::get()->escape_string($s, $strip_tags);
 }
 
-function db_query( $query, $die_on_error = true) {
+function db_query($query, $die_on_error = true) {
 	return Db::get()->query($query, $die_on_error);
 }
 
@@ -21,7 +21,7 @@ function db_fetch_result($result, $row, $param) {
 	return Db::get()->fetch_result($result, $row, $param);
 }
 
-function db_affected_rows( $result) {
+function db_affected_rows($result) {
 	return Db::get()->affected_rows($result);
 }
 
diff --git a/include/digest.php b/include/digest.php
index a3f414271..965fd1a79 100644
--- a/include/digest.php
+++ b/include/digest.php
@@ -6,7 +6,7 @@
 	 * @param integer $limit The maximum number of articles by digest.
 	 * @return boolean Return false if digests are not enabled.
 	 */
-	function send_headlines_digests( $debug = false) {
+	function send_headlines_digests($debug = false) {
 
 		require_once 'classes/ttrssmailer.php';
 
@@ -21,13 +21,13 @@
 			$interval_query = "last_digest_sent < DATE_SUB(NOW(), INTERVAL 1 DAY)";
 		}
 
-		$result = db_query( "SELECT id,email FROM ttrss_users
+		$result = db_query("SELECT id,email FROM ttrss_users
 				WHERE email != '' AND (last_digest_sent IS NULL OR $interval_query)");
 
 		while ($line = db_fetch_assoc($result)) {
 
-			if (get_pref( 'DIGEST_ENABLE', $line['id'], false)) {
-				$preferred_ts = strtotime(get_pref( 'DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
+			if (get_pref('DIGEST_ENABLE', $line['id'], false)) {
+				$preferred_ts = strtotime(get_pref('DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
 
 				// try to send digests within 2 hours of preferred time
 				if ($preferred_ts && time() >= $preferred_ts &&
@@ -35,14 +35,14 @@
 
 					if ($debug) _debug("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
 
-					$do_catchup = get_pref( 'DIGEST_CATCHUP', $line['id'], false);
+					$do_catchup = get_pref('DIGEST_CATCHUP', $line['id'], false);
 
 					global $tz_offset;
 
 					// reset tz_offset global to prevent tz cache clash between users
 					$tz_offset = -1;
 
-					$tuple = prepare_headlines_digest( $line["id"], 1, $limit);
+					$tuple = prepare_headlines_digest($line["id"], 1, $limit);
 					$digest = $tuple[0];
 					$headlines_count = $tuple[1];
 					$affected_ids = $tuple[2];
@@ -60,13 +60,13 @@
 
 						if ($rc && $do_catchup) {
 							if ($debug) _debug("Marking affected articles as read...");
-							catchupArticlesById( $affected_ids, 0, $line["id"]);
+							catchupArticlesById($affected_ids, 0, $line["id"]);
 						}
 					} else {
 						if ($debug) _debug("No headlines");
 					}
 
-					db_query( "UPDATE ttrss_users SET last_digest_sent = NOW()
+					db_query("UPDATE ttrss_users SET last_digest_sent = NOW()
 						WHERE id = " . $line["id"]);
 
 				}
@@ -77,7 +77,7 @@
 
 	}
 
-	function prepare_headlines_digest( $user_id, $days = 1, $limit = 1000) {
+	function prepare_headlines_digest($user_id, $days = 1, $limit = 1000) {
 
 		require_once "lib/MiniTemplator.class.php";
 
@@ -87,7 +87,7 @@
 		$tpl->readTemplateFromFile("templates/digest_template_html.txt");
 		$tpl_t->readTemplateFromFile("templates/digest_template.txt");
 
-		$user_tz_string = get_pref( 'USER_TIMEZONE', $user_id);
+		$user_tz_string = get_pref('USER_TIMEZONE', $user_id);
 		$local_ts = convert_timestamp(time(), 'UTC', $user_tz_string);
 
 		$tpl->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
@@ -104,7 +104,7 @@
 			$interval_query = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
 		}
 
-		$result = db_query( "SELECT ttrss_entries.title,
+		$result = db_query("SELECT ttrss_entries.title,
 				ttrss_feeds.title AS feed_title,
 				COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS cat_title,
 				date_updated,
@@ -143,7 +143,7 @@
 
 			array_push($affected_ids, $line["ref_id"]);
 
-			$updated = make_local_datetime( $line['last_updated'], false,
+			$updated = make_local_datetime($line['last_updated'], false,
 				$user_id);
 
 /*			if ($line["score"] != 0) {
@@ -152,7 +152,7 @@
 				$line["title"] .= " (".$line['score'].")";
 			} */
 
-			if (get_pref( 'ENABLE_FEED_CATS', $user_id)) {
+			if (get_pref('ENABLE_FEED_CATS', $user_id)) {
 				$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
 			}
 
diff --git a/include/feedbrowser.php b/include/feedbrowser.php
index 7bafe68ac..6c245121f 100644
--- a/include/feedbrowser.php
+++ b/include/feedbrowser.php
@@ -1,5 +1,5 @@
 <?php
-	function make_feed_browser( $search, $limit, $mode = 1) {
+	function make_feed_browser($search, $limit, $mode = 1) {
 
 		$owner_uid = $_SESSION["uid"];
 		$rv = '';
@@ -12,13 +12,13 @@
 		}
 
 		if ($mode == 1) {
-			/* $result = db_query( "SELECT feed_url, subscribers FROM
+			/* $result = db_query("SELECT feed_url, subscribers FROM
 			 ttrss_feedbrowser_cache WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
 			WHERE tf.feed_url = ttrss_feedbrowser_cache.feed_url
 			AND owner_uid = '$owner_uid') $search_qpart
 			ORDER BY subscribers DESC LIMIT $limit"); */
 
-			$result = db_query( "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
+			$result = db_query("SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
 						(SELECT feed_url, site_url, title, subscribers FROM ttrss_feedbrowser_cache UNION ALL
 							SELECT feed_url, site_url, title, subscribers FROM ttrss_linked_feeds) AS qqq
 						WHERE
@@ -28,7 +28,7 @@
 						GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT $limit");
 
 		} else if ($mode == 2) {
-			$result = db_query( "SELECT *,
+			$result = db_query("SELECT *,
 						(SELECT COUNT(*) FROM ttrss_user_entries WHERE
 					 		orig_feed_id = ttrss_archived_feeds.id) AS articles_archived
 						FROM
diff --git a/include/functions.php b/include/functions.php
index 971c61e2f..66d5896d1 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -166,9 +166,9 @@
 	 * @access public
 	 * @return void
 	 */
-	function purge_feed( $feed_id, $purge_interval, $debug = false) {
+	function purge_feed($feed_id, $purge_interval, $debug = false) {
 
-		if (!$purge_interval) $purge_interval = feed_purge_interval( $feed_id);
+		if (!$purge_interval) $purge_interval = feed_purge_interval($feed_id);
 
 		$rows = -1;
 
@@ -183,7 +183,7 @@
 
 		if ($purge_interval == -1 || !$purge_interval) {
 			if ($owner_uid) {
-				ccache_update( $feed_id, $owner_uid);
+				ccache_update($feed_id, $owner_uid);
 			}
 			return;
 		}
@@ -191,7 +191,7 @@
 		if (!$owner_uid) return;
 
 		if (FORCE_ARTICLE_PURGE == 0) {
-			$purge_unread = get_pref( "PURGE_UNREAD_ARTICLES",
+			$purge_unread = get_pref("PURGE_UNREAD_ARTICLES",
 				$owner_uid, false);
 		} else {
 			$purge_unread = true;
@@ -205,7 +205,7 @@
 
 			if (preg_match("/^7\./", $pg_version) || preg_match("/^8\.0/", $pg_version)) {
 
-				$result = db_query( "DELETE FROM ttrss_user_entries WHERE
+				$result = db_query("DELETE FROM ttrss_user_entries WHERE
 					ttrss_entries.id = ref_id AND
 					marked = false AND
 					feed_id = '$feed_id' AND
@@ -214,7 +214,7 @@
 
 			} else {
 
-				$result = db_query( "DELETE FROM ttrss_user_entries
+				$result = db_query("DELETE FROM ttrss_user_entries
 					USING ttrss_entries
 					WHERE ttrss_entries.id = ref_id AND
 					marked = false AND
@@ -227,12 +227,12 @@
 
 		} else {
 
-/*			$result = db_query( "DELETE FROM ttrss_user_entries WHERE
+/*			$result = db_query("DELETE FROM ttrss_user_entries WHERE
 				marked = false AND feed_id = '$feed_id' AND
 				(SELECT date_updated FROM ttrss_entries WHERE
 					id = ref_id) < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */
 
-			$result = db_query( "DELETE FROM ttrss_user_entries
+			$result = db_query("DELETE FROM ttrss_user_entries
 				USING ttrss_user_entries, ttrss_entries
 				WHERE ttrss_entries.id = ref_id AND
 				marked = false AND
@@ -244,7 +244,7 @@
 
 		}
 
-		ccache_update( $feed_id, $owner_uid);
+		ccache_update($feed_id, $owner_uid);
 
 		if ($debug) {
 			_debug("Purged feed $feed_id ($purge_interval): deleted $rows articles");
@@ -253,9 +253,9 @@
 		return $rows;
 	} // function purge_feed
 
-	function feed_purge_interval( $feed_id) {
+	function feed_purge_interval($feed_id) {
 
-		$result = db_query( "SELECT purge_interval, owner_uid FROM ttrss_feeds
+		$result = db_query("SELECT purge_interval, owner_uid FROM ttrss_feeds
 			WHERE id = '$feed_id'");
 
 		if (db_num_rows($result) == 1) {
@@ -272,20 +272,20 @@
 		}
 	}
 
-	function purge_orphans( $do_output = false) {
+	function purge_orphans($do_output = false) {
 
 		// purge orphaned posts in main content table
-		$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");
 
 		if ($do_output) {
-			$rows = db_affected_rows( $result);
+			$rows = db_affected_rows($result);
 			_debug("Purged $rows orphaned posts.");
 		}
 	}
 
-	function get_feed_update_interval( $feed_id) {
-		$result = db_query( "SELECT owner_uid, update_interval FROM
+	function get_feed_update_interval($feed_id) {
+		$result = db_query("SELECT owner_uid, update_interval FROM
 			ttrss_feeds WHERE id = '$feed_id'");
 
 		if (db_num_rows($result) == 1) {
@@ -295,7 +295,7 @@
 			if ($update_interval != 0) {
 				return $update_interval;
 			} else {
-				return get_pref( 'DEFAULT_UPDATE_INTERVAL', $owner_uid, false);
+				return get_pref('DEFAULT_UPDATE_INTERVAL', $owner_uid, false);
 			}
 
 		} else {
@@ -552,9 +552,9 @@
 		}
 	}
 
-	function initialize_user_prefs( $uid, $profile = false) {
+	function initialize_user_prefs($uid, $profile = false) {
 
-		$uid = db_escape_string( $uid);
+		$uid = db_escape_string($uid);
 
 		if (!$profile) {
 			$profile = "NULL";
@@ -565,11 +565,11 @@
 
 		if (get_schema_version() < 63) $profile_qpart = "";
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
-		$result = db_query( "SELECT pref_name,def_value FROM ttrss_prefs");
+		$result = db_query("SELECT pref_name,def_value FROM ttrss_prefs");
 
-		$u_result = db_query( "SELECT pref_name
+		$u_result = db_query("SELECT pref_name
 			FROM ttrss_user_prefs WHERE owner_uid = '$uid' $profile_qpart");
 
 		$active_prefs = array();
@@ -582,16 +582,16 @@
 			if (array_search($line["pref_name"], $active_prefs) === FALSE) {
 //				print "adding " . $line["pref_name"] . "<br>";
 
-				$line["def_value"] = db_escape_string( $line["def_value"]);
-				$line["pref_name"] = db_escape_string( $line["pref_name"]);
+				$line["def_value"] = db_escape_string($line["def_value"]);
+				$line["pref_name"] = db_escape_string($line["pref_name"]);
 
 				if (get_schema_version() < 63) {
-					db_query( "INSERT INTO ttrss_user_prefs
+					db_query("INSERT INTO ttrss_user_prefs
 						(owner_uid,pref_name,value) VALUES
 						('$uid', '".$line["pref_name"]."','".$line["def_value"]."')");
 
 				} else {
-					db_query( "INSERT INTO ttrss_user_prefs
+					db_query("INSERT INTO ttrss_user_prefs
 						(owner_uid,pref_name,value, profile) VALUES
 						('$uid', '".$line["pref_name"]."','".$line["def_value"]."', $profile)");
 				}
@@ -599,7 +599,7 @@
 			}
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 
 	}
 
@@ -613,7 +613,7 @@
 		return "";
 	}
 
-	function authenticate_user( $login, $password, $check_only = false) {
+	function authenticate_user($login, $password, $check_only = false) {
 
 		if (!SINGLE_USER_MODE) {
 			$user_id = false;
@@ -635,14 +635,14 @@
 				$_SESSION["uid"] = $user_id;
 				$_SESSION["version"] = VERSION;
 
-				$result = db_query( "SELECT login,access_level,pwd_hash FROM ttrss_users
+				$result = db_query("SELECT login,access_level,pwd_hash FROM ttrss_users
 					WHERE id = '$user_id'");
 
 				$_SESSION["name"] = db_fetch_result($result, 0, "login");
 				$_SESSION["access_level"] = db_fetch_result($result, 0, "access_level");
 				$_SESSION["csrf_token"] = sha1(uniqid(rand(), true));
 
-				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["ip_address"] = $_SERVER["REMOTE_ADDR"];
@@ -651,7 +651,7 @@
 
 				$_SESSION["last_version_check"] = time();
 
-				initialize_user_prefs( $_SESSION["uid"]);
+				initialize_user_prefs($_SESSION["uid"]);
 
 				return true;
 			}
@@ -675,7 +675,7 @@
 
 			$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
 
-			initialize_user_prefs( $_SESSION["uid"]);
+			initialize_user_prefs($_SESSION["uid"]);
 
 			return true;
 		}
@@ -704,13 +704,13 @@
 
 	// user preferences are checked on every login, not here
 
-	function initialize_user( $uid) {
+	function initialize_user($uid) {
 
-		db_query( "insert into ttrss_feeds (owner_uid,title,feed_url)
+		db_query("insert into ttrss_feeds (owner_uid,title,feed_url)
 			values ('$uid', 'Tiny Tiny RSS: New Releases',
 			'http://tt-rss.org/releases.rss')");
 
-		db_query( "insert into ttrss_feeds (owner_uid,title,feed_url)
+		db_query("insert into ttrss_feeds (owner_uid,title,feed_url)
 			values ('$uid', 'Tiny Tiny RSS: Forum',
 				'http://tt-rss.org/forum/rss.php')");
 	}
@@ -726,9 +726,9 @@
 		return $csrf_token == $_SESSION['csrf_token'];
 	}
 
-	function load_user_plugins( $owner_uid) {
+	function load_user_plugins($owner_uid) {
 		if ($owner_uid) {
-			$plugins = get_pref( "_ENABLED_PLUGINS", $owner_uid);
+			$plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
 			global $pluginhost;
 			$pluginhost->load($plugins, $pluginhost::KIND_USER, $owner_uid);
@@ -744,18 +744,18 @@
 
 		if (SINGLE_USER_MODE) {
 			@session_start();
-			authenticate_user( "admin", null);
+			authenticate_user("admin", null);
 			cache_prefs();
-			load_user_plugins( $_SESSION["uid"]);
+			load_user_plugins($_SESSION["uid"]);
 		} else {
 			if (!validate_session()) $_SESSION["uid"] = false;
 
 			if (!$_SESSION["uid"]) {
 
-				if (AUTH_AUTO_LOGIN && authenticate_user( null, null)) {
-				    $_SESSION["ref_schema_version"] = get_schema_version( true);
+				if (AUTH_AUTO_LOGIN && authenticate_user(null, null)) {
+				    $_SESSION["ref_schema_version"] = get_schema_version(true);
 				} else {
-					 authenticate_user( null, null, true);
+					 authenticate_user(null, null, true);
 				}
 
 				if (!$_SESSION["uid"]) {
@@ -768,7 +768,7 @@
 
 			} else {
 				/* bump login timestamp */
-				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();
 			}
@@ -780,16 +780,16 @@
 
 			if ($_SESSION["uid"]) {
 				cache_prefs();
-				load_user_plugins( $_SESSION["uid"]);
+				load_user_plugins($_SESSION["uid"]);
 
 				/* cleanup ccache */
 
-				db_query( "DELETE FROM ttrss_counters_cache WHERE owner_uid = ".
+				db_query("DELETE FROM ttrss_counters_cache WHERE owner_uid = ".
 					$_SESSION["uid"] . " AND
 						(SELECT COUNT(id) FROM ttrss_feeds WHERE
 							ttrss_feeds.id = feed_id) = 0");
 
-				db_query( "DELETE FROM ttrss_cat_counters_cache WHERE owner_uid = ".
+				db_query("DELETE FROM ttrss_cat_counters_cache WHERE owner_uid = ".
 					$_SESSION["uid"] . " AND
 						(SELECT COUNT(id) FROM ttrss_feed_categories WHERE
 							ttrss_feed_categories.id = feed_id) = 0");
@@ -825,7 +825,7 @@
 		return $dt->format('U') + $dest_tz->getOffset($dt);
 	}
 
-	function make_local_datetime( $timestamp, $long, $owner_uid = false,
+	function make_local_datetime($timestamp, $long, $owner_uid = false,
 					$no_smart_dt = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
@@ -839,7 +839,7 @@
 
 		if ($tz_offset == -1) {
 
-			$user_tz_string = get_pref( 'USER_TIMEZONE', $owner_uid);
+			$user_tz_string = get_pref('USER_TIMEZONE', $owner_uid);
 
 			try {
 				$user_tz = new DateTimeZone($user_tz_string);
@@ -853,28 +853,28 @@
 		$user_timestamp = $dt->format('U') + $tz_offset;
 
 		if (!$no_smart_dt) {
-			return smart_date_time( $user_timestamp,
+			return smart_date_time($user_timestamp,
 				$tz_offset, $owner_uid);
 		} else {
 			if ($long)
-				$format = get_pref( 'LONG_DATE_FORMAT', $owner_uid);
+				$format = get_pref('LONG_DATE_FORMAT', $owner_uid);
 			else
-				$format = get_pref( 'SHORT_DATE_FORMAT', $owner_uid);
+				$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
 
 			return date($format, $user_timestamp);
 		}
 	}
 
-	function smart_date_time( $timestamp, $tz_offset = 0, $owner_uid = false) {
+	function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
 		if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
 			return date("G:i", $timestamp);
 		} else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) {
-			$format = get_pref( 'SHORT_DATE_FORMAT', $owner_uid);
+			$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
 			return date($format, $timestamp);
 		} else {
-			$format = get_pref( 'LONG_DATE_FORMAT', $owner_uid);
+			$format = get_pref('LONG_DATE_FORMAT', $owner_uid);
 			return date($format, $timestamp);
 		}
 	}
@@ -898,11 +898,11 @@
 	// Session caching removed due to causing wrong redirects to upgrade
 	// script when get_schema_version() is called on an obsolete session
 	// created on a previous schema version.
-	function get_schema_version( $nocache = false) {
+	function get_schema_version($nocache = false) {
 		global $schema_version;
 
 		if (!$schema_version) {
-			$result = db_query( "SELECT schema_version FROM ttrss_version");
+			$result = db_query("SELECT schema_version FROM ttrss_version");
 			$version = db_fetch_result($result, 0, "schema_version");
 			$schema_version = $version;
 			return $version;
@@ -915,20 +915,20 @@
 		require_once 'errors.php';
 
 		$error_code = 0;
-		$schema_version = get_schema_version( true);
+		$schema_version = get_schema_version(true);
 
 		if ($schema_version != SCHEMA_VERSION) {
 			$error_code = 5;
 		}
 
 		if (DB_TYPE == "mysql") {
-			$result = db_query( "SELECT true", false);
+			$result = db_query("SELECT true", false);
 			if (db_num_rows($result) != 1) {
 				$error_code = 10;
 			}
 		}
 
-		if (db_escape_string( "testTEST") != "testTEST") {
+		if (db_escape_string("testTEST") != "testTEST") {
 			$error_code = 12;
 		}
 
@@ -987,7 +987,7 @@
 		}
 	}
 
-	function catchup_feed( $feed, $cat_view, $owner_uid = false, $max_id = false, $mode = 'all') {
+	function catchup_feed($feed, $cat_view, $owner_uid = false, $max_id = false, $mode = 'all') {
 
 			if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
@@ -1029,7 +1029,7 @@
 					if ($feed >= 0) {
 
 						if ($feed > 0) {
-							$children = getChildCategories( $feed, $owner_uid);
+							$children = getChildCategories($feed, $owner_uid);
 							array_push($children, $feed);
 
 							$children = join(",", $children);
@@ -1039,7 +1039,7 @@
 							$cat_qpart = "cat_id IS NULL";
 						}
 
-						db_query( "UPDATE ttrss_user_entries
+						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1048,7 +1048,7 @@
 
 					} else if ($feed == -2) {
 
-						db_query( "UPDATE ttrss_user_entries
+						db_query("UPDATE ttrss_user_entries
 							SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
 								FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0
 								AND unread = true AND $date_qpart AND owner_uid = $owner_uid");
@@ -1056,7 +1056,7 @@
 
 				} else if ($feed > 0) {
 
-					db_query( "UPDATE ttrss_user_entries
+					db_query("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
 								(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1065,7 +1065,7 @@
 				} else if ($feed < 0 && $feed > LABEL_BASE_INDEX) { // special, like starred
 
 					if ($feed == -1) {
-						db_query( "UPDATE ttrss_user_entries
+						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1073,7 +1073,7 @@
 					}
 
 					if ($feed == -2) {
-						db_query( "UPDATE ttrss_user_entries
+						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1082,7 +1082,7 @@
 
 					if ($feed == -3) {
 
-						$intl = get_pref( "FRESH_ARTICLE_MAX_AGE");
+						$intl = get_pref("FRESH_ARTICLE_MAX_AGE");
 
 						if (DB_TYPE == "pgsql") {
 							$match_part = "date_entered > NOW() - INTERVAL '$intl hour' ";
@@ -1091,7 +1091,7 @@
 								INTERVAL $intl HOUR) ";
 						}
 
-						db_query( "UPDATE ttrss_user_entries
+						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1099,7 +1099,7 @@
 					}
 
 					if ($feed == -4) {
-						db_query( "UPDATE ttrss_user_entries
+						db_query("UPDATE ttrss_user_entries
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
@@ -1110,7 +1110,7 @@
 
 					$label_id = feed_to_label_id($feed);
 
-					db_query( "UPDATE ttrss_user_entries
+					db_query("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
 								(SELECT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_user_labels2 WHERE ref_id = id
@@ -1119,10 +1119,10 @@
 
 				}
 
-				ccache_update( $feed, $owner_uid, $cat_view);
+				ccache_update($feed, $owner_uid, $cat_view);
 
 			} else { // tag
-				db_query( "UPDATE ttrss_user_entries
+				db_query("UPDATE ttrss_user_entries
 					SET unread = false, last_read = NOW() WHERE ref_id IN
 						(SELECT id FROM
 							(SELECT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_tags WHERE ref_id = ttrss_entries.id
@@ -1137,13 +1137,13 @@
 
 		$data = array_merge($data, getVirtCounters());
 		$data = array_merge($data, getLabelCounters());
-		$data = array_merge($data, getFeedCounters( $active_feed));
+		$data = array_merge($data, getFeedCounters($active_feed));
 		$data = array_merge($data, getCategoryCounters());
 
 		return $data;
 	}
 
-	function getCategoryTitle( $cat_id) {
+	function getCategoryTitle($cat_id) {
 
 		if ($cat_id == -1) {
 			return __("Special");
@@ -1151,7 +1151,7 @@
 			return __("Labels");
 		} else {
 
-			$result = db_query( "SELECT title FROM ttrss_feed_categories WHERE
+			$result = db_query("SELECT title FROM ttrss_feed_categories WHERE
 				id = '$cat_id'");
 
 			if (db_num_rows($result) == 1) {
@@ -1169,11 +1169,11 @@
 		/* Labels category */
 
 		$cv = array("id" => -2, "kind" => "cat",
-			"counter" => getCategoryUnread( -2));
+			"counter" => getCategoryUnread(-2));
 
 		array_push($ret_arr, $cv);
 
-		$result = db_query( "SELECT id AS cat_id, value AS unread,
+		$result = db_query("SELECT id AS cat_id, value AS unread,
 			(SELECT COUNT(id) FROM ttrss_feed_categories AS c2
 				WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children
 			FROM ttrss_feed_categories, ttrss_cat_counters_cache
@@ -1185,7 +1185,7 @@
 			$line["cat_id"] = (int) $line["cat_id"];
 
 			if ($line["num_children"] > 0) {
-				$child_counter = getCategoryChildrenUnread( $line["cat_id"], $_SESSION["uid"]);
+				$child_counter = getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
 			} else {
 				$child_counter = 0;
 			}
@@ -1199,7 +1199,7 @@
 		/* Special case: NULL category doesn't actually exist in the DB */
 
 		$cv = array("id" => 0, "kind" => "cat",
-			"counter" => (int) ccache_find( 0, $_SESSION["uid"], true));
+			"counter" => (int) ccache_find(0, $_SESSION["uid"], true));
 
 		array_push($ret_arr, $cv);
 
@@ -1207,23 +1207,23 @@
 	}
 
 	// only accepts real cats (>= 0)
-	function getCategoryChildrenUnread( $cat, $owner_uid = false) {
+	function getCategoryChildrenUnread($cat, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$result = db_query( "SELECT id FROM ttrss_feed_categories WHERE parent_cat = '$cat'
+		$result = db_query("SELECT id FROM ttrss_feed_categories WHERE parent_cat = '$cat'
 				AND owner_uid = $owner_uid");
 
 		$unread = 0;
 
 		while ($line = db_fetch_assoc($result)) {
-			$unread += getCategoryUnread( $line["id"], $owner_uid);
-			$unread += getCategoryChildrenUnread( $line["id"], $owner_uid);
+			$unread += getCategoryUnread($line["id"], $owner_uid);
+			$unread += getCategoryChildrenUnread($line["id"], $owner_uid);
 		}
 
 		return $unread;
 	}
 
-	function getCategoryUnread( $cat, $owner_uid = false) {
+	function getCategoryUnread($cat, $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -1235,7 +1235,7 @@
 				$cat_query = "cat_id IS NULL";
 			}
 
-			$result = db_query( "SELECT id FROM ttrss_feeds WHERE $cat_query
+			$result = db_query("SELECT id FROM ttrss_feeds WHERE $cat_query
 					AND owner_uid = " . $owner_uid);
 
 			$cat_feeds = array();
@@ -1247,7 +1247,7 @@
 
 			$match_part = implode(" OR ", $cat_feeds);
 
-			$result = db_query( "SELECT COUNT(int_id) AS unread
+			$result = db_query("SELECT COUNT(int_id) AS unread
 				FROM ttrss_user_entries
 				WHERE	unread = true AND ($match_part)
 				AND owner_uid = " . $owner_uid);
@@ -1261,10 +1261,10 @@
 
 			return $unread;
 		} else if ($cat == -1) {
-			return getFeedUnread( -1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0);
+			return getFeedUnread(-1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0);
 		} else if ($cat == -2) {
 
-			$result = db_query( "
+			$result = db_query("
 				SELECT COUNT(unread) AS unread FROM
 					ttrss_user_entries, ttrss_user_labels2
 				WHERE article_id = ref_id AND unread = true
@@ -1277,14 +1277,14 @@
 		}
 	}
 
-	function getFeedUnread( $feed, $is_cat = false) {
-		return getFeedArticles( $feed, $is_cat, true, $_SESSION["uid"]);
+	function getFeedUnread($feed, $is_cat = false) {
+		return getFeedArticles($feed, $is_cat, true, $_SESSION["uid"]);
 	}
 
-	function getLabelUnread( $label_id, $owner_uid = false) {
+	function getLabelUnread($label_id, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$result = db_query( "SELECT COUNT(ref_id) AS unread FROM ttrss_user_entries, ttrss_user_labels2
+		$result = db_query("SELECT COUNT(ref_id) AS unread FROM ttrss_user_entries, ttrss_user_labels2
 			WHERE owner_uid = '$owner_uid' AND unread = true AND label_id = '$label_id' AND article_id = ref_id");
 
 		if (db_num_rows($result) != 0) {
@@ -1294,7 +1294,7 @@
 		}
 	}
 
-	function getFeedArticles( $feed, $is_cat = false, $unread_only = false,
+	function getFeedArticles($feed, $is_cat = false, $unread_only = false,
 		$owner_uid = false) {
 
 		$n_feed = (int) $feed;
@@ -1309,14 +1309,14 @@
 		}
 
 		if ($is_cat) {
-			return getCategoryUnread( $n_feed, $owner_uid);
+			return getCategoryUnread($n_feed, $owner_uid);
 		} else if ($n_feed == -6) {
 			return 0;
 		} else if ($feed != "0" && $n_feed == 0) {
 
-			$feed = db_escape_string( $feed);
+			$feed = db_escape_string($feed);
 
-			$result = db_query( "SELECT SUM((SELECT COUNT(int_id)
+			$result = db_query("SELECT SUM((SELECT COUNT(int_id)
 				FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
 					AND ref_id = id AND $unread_qpart)) AS count FROM ttrss_tags
 				WHERE owner_uid = $owner_uid AND tag_name = '$feed'");
@@ -1329,7 +1329,7 @@
 		} else if ($n_feed == -3) {
 			$match_part = "unread = true AND score >= 0";
 
-			$intl = get_pref( "FRESH_ARTICLE_MAX_AGE", $owner_uid);
+			$intl = get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
 			if (DB_TYPE == "pgsql") {
 				$match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
@@ -1353,7 +1353,7 @@
 
 			$label_id = feed_to_label_id($feed);
 
-			return getLabelUnread( $label_id, $owner_uid);
+			return getLabelUnread($label_id, $owner_uid);
 
 		}
 
@@ -1372,11 +1372,11 @@
 
 			//echo "[$feed/$query]\n";
 
-			$result = db_query( $query);
+			$result = db_query($query);
 
 		} else {
 
-			$result = db_query( "SELECT COUNT(post_int_id) AS unread
+			$result = db_query("SELECT COUNT(post_int_id) AS unread
 				FROM ttrss_tags,ttrss_user_entries,ttrss_entries
 				WHERE tag_name = '$feed' AND post_int_id = int_id AND ref_id = ttrss_entries.id
 				AND $unread_qpart AND ttrss_tags.owner_uid = " . $owner_uid);
@@ -1387,13 +1387,13 @@
 		return $unread;
 	}
 
-	function getGlobalUnread( $user_id = false) {
+	function getGlobalUnread($user_id = false) {
 
 		if (!$user_id) {
 			$user_id = $_SESSION["uid"];
 		}
 
-		$result = db_query( "SELECT SUM(value) AS c_id FROM ttrss_counters_cache
+		$result = db_query("SELECT SUM(value) AS c_id FROM ttrss_counters_cache
 			WHERE owner_uid = '$user_id' AND feed_id > 0");
 
 		$c_id = db_fetch_result($result, 0, "c_id");
@@ -1401,7 +1401,7 @@
 		return $c_id;
 	}
 
-	function getGlobalCounters( $global_unread = -1) {
+	function getGlobalCounters($global_unread = -1) {
 		$ret_arr = array();
 
 		if ($global_unread == -1) {
@@ -1413,7 +1413,7 @@
 
 		array_push($ret_arr, $cv);
 
-		$result = db_query( "SELECT COUNT(id) AS fn FROM
+		$result = db_query("SELECT COUNT(id) AS fn FROM
 			ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
 		$subscribed_feeds = db_fetch_result($result, 0, "fn");
@@ -1432,13 +1432,13 @@
 
 		for ($i = 0; $i >= -4; $i--) {
 
-			$count = getFeedUnread( $i);
+			$count = getFeedUnread($i);
 
 			$cv = array("id" => $i,
 				"counter" => (int) $count);
 
-//			if (get_pref( 'EXTENDED_FEEDLIST'))
-//				$cv["xmsg"] = getFeedArticles( $i)." ".__("total");
+//			if (get_pref('EXTENDED_FEEDLIST'))
+//				$cv["xmsg"] = getFeedArticles($i)." ".__("total");
 
 			array_push($ret_arr, $cv);
 		}
@@ -1461,13 +1461,13 @@
 		return $ret_arr;
 	}
 
-	function getLabelCounters( $descriptions = false) {
+	function getLabelCounters($descriptions = false) {
 
 		$ret_arr = array();
 
 		$owner_uid = $_SESSION["uid"];
 
-		$result = db_query( "SELECT id,caption,COUNT(unread) AS unread
+		$result = db_query("SELECT id,caption,COUNT(unread) AS unread
 			FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
 				(ttrss_labels2.id = label_id)
 				LEFT JOIN ttrss_user_entries ON (ref_id = article_id AND unread = true
@@ -1488,8 +1488,8 @@
 			if ($descriptions)
 				$cv["description"] = $label_name;
 
-//			if (get_pref( 'EXTENDED_FEEDLIST'))
-//				$cv["xmsg"] = getFeedArticles( $id)." ".__("total");
+//			if (get_pref('EXTENDED_FEEDLIST'))
+//				$cv["xmsg"] = getFeedArticles($id)." ".__("total");
 
 			array_push($ret_arr, $cv);
 		}
@@ -1497,7 +1497,7 @@
 		return $ret_arr;
 	}
 
-	function getFeedCounters( $active_feed = false) {
+	function getFeedCounters($active_feed = false) {
 
 		$ret_arr = array();
 
@@ -1510,7 +1510,7 @@
 				AND ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid
 				AND ttrss_counters_cache.feed_id = id";
 
-		$result = db_query( $query);
+		$result = db_query($query);
 		$fctrs_modified = false;
 
 		while ($line = db_fetch_assoc($result)) {
@@ -1519,7 +1519,7 @@
 			$count = $line["count"];
 			$last_error = htmlspecialchars($line["last_error"]);
 
-			$last_updated = make_local_datetime( $line['last_updated'], false);
+			$last_updated = make_local_datetime($line['last_updated'], false);
 
 			$has_img = feed_has_icon($id);
 
@@ -1534,8 +1534,8 @@
 			if ($last_error)
 				$cv["error"] = $last_error;
 
-//			if (get_pref( 'EXTENDED_FEEDLIST'))
-//				$cv["xmsg"] = getFeedArticles( $id)." ".__("total");
+//			if (get_pref('EXTENDED_FEEDLIST'))
+//				$cv["xmsg"] = getFeedArticles($id)." ".__("total");
 
 			if ($active_feed && $id == $active_feed)
 				$cv["title"] = truncate_string($line["title"], 30);
@@ -1548,7 +1548,7 @@
 	}
 
 	function get_pgsql_version() {
-		$result = db_query( "SELECT version() AS version");
+		$result = db_query("SELECT version() AS version");
 		$version = explode(" ", db_fetch_result($result, 0, "version"));
 		return $version[1];
 	}
@@ -1565,7 +1565,7 @@
 	 *                     to get all possible feeds.
 	 *                 5 - Couldn't download the URL content.
 	 */
-	function subscribe_to_feed( $url, $cat_id = 0,
+	function subscribe_to_feed($url, $cat_id = 0,
 			$auth_login = '', $auth_pass = '') {
 
 		global $fetch_last_error;
@@ -1612,7 +1612,7 @@
 			$auth_pass_encrypted = 'false';
 		}
 
-		$auth_pass = db_escape_string( $auth_pass);
+		$auth_pass = db_escape_string($auth_pass);
 
 		if (db_num_rows($result) == 0) {
 			$result = db_query(
@@ -1628,7 +1628,7 @@
 			$feed_id = db_fetch_result($result, 0, "id");
 
 			if ($feed_id) {
-				update_rss_feed( $feed_id, true);
+				update_rss_feed($feed_id, true);
 			}
 
 			return array("code" => 1);
@@ -1637,7 +1637,7 @@
 		}
 	}
 
-	function print_feed_select( $id, $default_id = "",
+	function print_feed_select($id, $default_id = "",
 		$attributes = "", $include_all_feeds = true,
 	  	$root_id = false, $nest_level = 0) {
 
@@ -1649,14 +1649,14 @@
 			}
 		}
 
-		if (get_pref( 'ENABLE_FEED_CATS')) {
+		if (get_pref('ENABLE_FEED_CATS')) {
 
 			if ($root_id)
 				$parent_qpart = "parent_cat = '$root_id'";
 			else
 				$parent_qpart = "parent_cat IS NULL";
 
-			$result = db_query( "SELECT id,title,
+			$result = db_query("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
 					c2.parent_cat = ttrss_feed_categories.id) AS num_children
 				FROM ttrss_feed_categories
@@ -1673,10 +1673,10 @@
 					$line["id"], htmlspecialchars($line["title"]));
 
 				if ($line["num_children"] > 0)
-					print_feed_select( $id, $default_id, $attributes,
+					print_feed_select($id, $default_id, $attributes,
 						$include_all_feeds, $line["id"], $nest_level+1);
 
-				$feed_result = db_query( "SELECT id,title FROM ttrss_feeds
+				$feed_result = db_query("SELECT id,title FROM ttrss_feeds
 					WHERE cat_id = '".$line["id"]."' AND owner_uid = ".$_SESSION["uid"] . " ORDER BY title");
 
 				while ($fline = db_fetch_assoc($feed_result)) {
@@ -1698,7 +1698,7 @@
 				printf("<option $is_selected value='CAT:0'>%s</option>",
 					__("Uncategorized"));
 
-				$feed_result = db_query( "SELECT id,title FROM ttrss_feeds
+				$feed_result = db_query("SELECT id,title FROM ttrss_feeds
 					WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"] . " ORDER BY title");
 
 				while ($fline = db_fetch_assoc($feed_result)) {
@@ -1715,7 +1715,7 @@
 			}
 
 		} else {
-			$result = db_query( "SELECT id,title FROM ttrss_feeds
+			$result = db_query("SELECT id,title FROM ttrss_feeds
 				WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
 			while ($line = db_fetch_assoc($result)) {
@@ -1732,7 +1732,7 @@
 		}
 	}
 
-	function print_feed_cat_select( $id, $default_id,
+	function print_feed_cat_select($id, $default_id,
 		$attributes, $include_all_cats = true, $root_id = false, $nest_level = 0) {
 
 			if (!$root_id) {
@@ -1744,7 +1744,7 @@
 			else
 				$parent_qpart = "parent_cat IS NULL";
 
-			$result = db_query( "SELECT id,title,
+			$result = db_query("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
 					c2.parent_cat = ttrss_feed_categories.id) AS num_children
 				FROM ttrss_feed_categories
@@ -1765,7 +1765,7 @@
 						$line["id"], htmlspecialchars($line["title"]));
 
 				if ($line["num_children"] > 0)
-					print_feed_cat_select( $id, $default_id, $attributes,
+					print_feed_cat_select($id, $default_id, $attributes,
 						$include_all_cats, $line["id"], $nest_level+1);
 			}
 
@@ -1791,13 +1791,13 @@
 		return ($val == "on") ? "true" : "false";
 	}
 
-	function getFeedCatTitle( $id) {
+	function getFeedCatTitle($id) {
 		if ($id == -1) {
 			return __("Special");
 		} else if ($id < LABEL_BASE_INDEX) {
 			return __("Labels");
 		} else if ($id > 0) {
-			$result = db_query( "SELECT ttrss_feed_categories.title
+			$result = db_query("SELECT ttrss_feed_categories.title
 				FROM ttrss_feeds, ttrss_feed_categories WHERE ttrss_feeds.id = '$id' AND
 					cat_id = ttrss_feed_categories.id");
 			if (db_num_rows($result) == 1) {
@@ -1844,9 +1844,9 @@
 		return false;
 	}
 
-	function getFeedTitle( $id, $cat = false) {
+	function getFeedTitle($id, $cat = false) {
 		if ($cat) {
-			return getCategoryTitle( $id);
+			return getCategoryTitle($id);
 		} else if ($id == -1) {
 			return __("Starred articles");
 		} else if ($id == -2) {
@@ -1861,7 +1861,7 @@
 			return __("Recently read");
 		} else if ($id < LABEL_BASE_INDEX) {
 			$label_id = feed_to_label_id($id);
-			$result = db_query( "SELECT caption FROM ttrss_labels2 WHERE id = '$label_id'");
+			$result = db_query("SELECT caption FROM ttrss_labels2 WHERE id = '$label_id'");
 			if (db_num_rows($result) == 1) {
 				return db_fetch_result($result, 0, "caption");
 			} else {
@@ -1869,7 +1869,7 @@
 			}
 
 		} else if (is_numeric($id) && $id > 0) {
-			$result = db_query( "SELECT title FROM ttrss_feeds WHERE id = '$id'");
+			$result = db_query("SELECT title FROM ttrss_feeds WHERE id = '$id'");
 			if (db_num_rows($result) == 1) {
 				return db_fetch_result($result, 0, "title");
 			} else {
@@ -1888,18 +1888,18 @@
 			"CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
 			"HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
 
-				 $params[strtolower($param)] = (int) get_pref( $param);
+				 $params[strtolower($param)] = (int) get_pref($param);
 		 }
 
 		$params["icons_url"] = ICONS_URL;
 		$params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME;
-		$params["default_view_mode"] = get_pref( "_DEFAULT_VIEW_MODE");
-		$params["default_view_limit"] = (int) get_pref( "_DEFAULT_VIEW_LIMIT");
-		$params["default_view_order_by"] = get_pref( "_DEFAULT_VIEW_ORDER_BY");
+		$params["default_view_mode"] = get_pref("_DEFAULT_VIEW_MODE");
+		$params["default_view_limit"] = (int) get_pref("_DEFAULT_VIEW_LIMIT");
+		$params["default_view_order_by"] = get_pref("_DEFAULT_VIEW_ORDER_BY");
 		$params["bw_limit"] = (int) $_SESSION["bw_limit"];
 		$params["label_base_index"] = (int) LABEL_BASE_INDEX;
 
-		$result = db_query( "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
+		$result = db_query("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
 			ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
 		$max_feed_id = db_fetch_result($result, 0, "mid");
@@ -1908,7 +1908,7 @@
 		$params["max_feed_id"] = (int) $max_feed_id;
 		$params["num_feeds"] = (int) $num_feeds;
 
-		$params["collapsed_feedlist"] = (int) get_pref( "_COLLAPSED_FEEDLIST");
+		$params["collapsed_feedlist"] = (int) get_pref("_COLLAPSED_FEEDLIST");
 		$params["hotkeys"] = get_hotkeys_map();
 
 		$params["csrf_token"] = $_SESSION["csrf_token"];
@@ -2054,7 +2054,7 @@
 				"^(191)|Ctrl+/" => "help_dialog",
 			);
 
-		if (get_pref( 'COMBINED_DISPLAY_MODE')) {
+		if (get_pref('COMBINED_DISPLAY_MODE')) {
 			$hotkeys["^(38)|Ctrl-up"] = "prev_article_noscroll";
 			$hotkeys["^(40)|Ctrl-down"] = "next_article_noscroll";
 		}
@@ -2080,7 +2080,7 @@
 	function make_runtime_info() {
 		$data = array();
 
-		$result = db_query( "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
+		$result = db_query("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
 			ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
 		$max_feed_id = db_fetch_result($result, 0, "mid");
@@ -2090,7 +2090,7 @@
 		$data["num_feeds"] = (int) $num_feeds;
 
 		$data['last_article_id'] = getLastArticleId();
-		$data['cdm_expanded'] = get_pref( 'CDM_EXPANDED');
+		$data['cdm_expanded'] = get_pref('CDM_EXPANDED');
 
 		$data['dep_ts'] = calculate_dep_timestamp();
 		$data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE');
@@ -2134,7 +2134,7 @@
 		return $data;
 	}
 
-	function search_to_sql( $search) {
+	function search_to_sql($search) {
 
 		$search_query_part = "";
 
@@ -2155,7 +2155,7 @@
 			case "title":
 				if ($commandpair[1]) {
 					array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE '%".
-						db_escape_string( mb_strtolower($commandpair[1]))."%'))");
+						db_escape_string(mb_strtolower($commandpair[1]))."%'))");
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
@@ -2164,7 +2164,7 @@
 			case "author":
 				if ($commandpair[1]) {
 					array_push($query_keywords, "($not (LOWER(author) LIKE '%".
-						db_escape_string( mb_strtolower($commandpair[1]))."%'))");
+						db_escape_string(mb_strtolower($commandpair[1]))."%'))");
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
@@ -2178,7 +2178,7 @@
 						array_push($query_keywords, "($not (note IS NULL OR note = ''))");
 					else
 						array_push($query_keywords, "($not (LOWER(note) LIKE '%".
-							db_escape_string( mb_strtolower($commandpair[1]))."%'))");
+							db_escape_string(mb_strtolower($commandpair[1]))."%'))");
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
@@ -2211,7 +2211,7 @@
 			default:
 				if (strpos($k, "@") === 0) {
 
-					$user_tz_string = get_pref( 'USER_TIMEZONE', $_SESSION['uid']);
+					$user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
 					$orig_ts = strtotime(substr($k, 1));
 					$k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
 
@@ -2230,35 +2230,35 @@
 		return $search_query_part;
 	}
 
-	function getParentCategories( $cat, $owner_uid) {
+	function getParentCategories($cat, $owner_uid) {
 		$rv = array();
 
-		$result = db_query( "SELECT parent_cat FROM ttrss_feed_categories
+		$result = db_query("SELECT parent_cat FROM ttrss_feed_categories
 			WHERE id = '$cat' AND parent_cat IS NOT NULL AND owner_uid = $owner_uid");
 
 		while ($line = db_fetch_assoc($result)) {
 			array_push($rv, $line["parent_cat"]);
-			$rv = array_merge($rv, getParentCategories( $line["parent_cat"], $owner_uid));
+			$rv = array_merge($rv, getParentCategories($line["parent_cat"], $owner_uid));
 		}
 
 		return $rv;
 	}
 
-	function getChildCategories( $cat, $owner_uid) {
+	function getChildCategories($cat, $owner_uid) {
 		$rv = array();
 
-		$result = db_query( "SELECT id FROM ttrss_feed_categories
+		$result = db_query("SELECT id FROM ttrss_feed_categories
 			WHERE parent_cat = '$cat' AND owner_uid = $owner_uid");
 
 		while ($line = db_fetch_assoc($result)) {
 			array_push($rv, $line["id"]);
-			$rv = array_merge($rv, getChildCategories( $line["id"], $owner_uid));
+			$rv = array_merge($rv, getChildCategories($line["id"], $owner_uid));
 		}
 
 		return $rv;
 	}
 
-	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) {
+	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 (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -2275,7 +2275,7 @@
 						$search_query_part = "ref_id = -1 AND ";
 
 				} else {
-					$search_query_part = search_to_sql( $search);
+					$search_query_part = search_to_sql($search);
 					$search_query_part .= " AND ";
 				}
 
@@ -2293,10 +2293,10 @@
 
 				$override_order = "updated DESC";
 
-				$filter_query_part = filter_to_sql( $filter, $owner_uid);
+				$filter_query_part = filter_to_sql($filter, $owner_uid);
 
 				// Try to check if SQL regexp implementation chokes on a valid regexp
-				$result = db_query( "SELECT true AS true_val FROM ttrss_entries,
+				$result = db_query("SELECT true AS true_val FROM ttrss_entries,
 					ttrss_user_entries, ttrss_feeds, ttrss_feed_categories
 					WHERE $filter_query_part LIMIT 1", false);
 
@@ -2329,10 +2329,10 @@
 					$view_query_part = " ";
 				} else if ($feed != -1) {
 
-					$unread = getFeedUnread( $feed, $cat_view);
+					$unread = getFeedUnread($feed, $cat_view);
 
 					if ($cat_view && $feed > 0 && $include_children)
-						$unread += getCategoryChildrenUnread( $feed);
+						$unread += getCategoryChildrenUnread($feed);
 
 					if ($unread > 0)
 			        $view_query_part = " unread = true AND ";
@@ -2378,7 +2378,7 @@
 
 				if ($feed > 0) {
 					if ($include_children) {
-						$subcats = getChildCategories( $feed, $owner_uid);
+						$subcats = getChildCategories($feed, $owner_uid);
 						array_push($subcats, $feed);
 						$cats_qpart = join(",", $subcats);
 					} else {
@@ -2398,7 +2398,7 @@
 					if ($feed > 0) {
 						if ($include_children) {
 							# sub-cats
-							$subcats = getChildCategories( $feed, $owner_uid);
+							$subcats = getChildCategories($feed, $owner_uid);
 
 							array_push($subcats, $feed);
 							$query_strategy_part = "cat_id IN (".
@@ -2461,7 +2461,7 @@
 			} else if ($feed == -3) { // fresh virtual feed
 				$query_strategy_part = "unread = true AND score >= 0";
 
-				$intl = get_pref( "FRESH_ARTICLE_MAX_AGE", $owner_uid);
+				$intl = get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
 				if (DB_TYPE == "pgsql") {
 					$query_strategy_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
@@ -2505,17 +2505,17 @@
 				$feed_title = T_sprintf("Search results: %s", $search);
 			} else {
 				if ($cat_view) {
-					$feed_title = getCategoryTitle( $feed);
+					$feed_title = getCategoryTitle($feed);
 				} else {
 					if (is_numeric($feed) && $feed > 0) {
-						$result = db_query( "SELECT title,site_url,last_error
+						$result = db_query("SELECT title,site_url,last_error
 							FROM ttrss_feeds WHERE id = '$feed' AND owner_uid = $owner_uid");
 
 						$feed_title = db_fetch_result($result, 0, "title");
 						$feed_site_url = db_fetch_result($result, 0, "site_url");
 						$last_error = db_fetch_result($result, 0, "last_error");
 					} else {
-						$feed_title = getFeedTitle( $feed);
+						$feed_title = getFeedTitle($feed);
 					}
 				}
 			}
@@ -2535,7 +2535,7 @@
 				}
 
 				// proper override_order applied above
-				if ($vfeed_query_part && !$ignore_vfeed_group && get_pref( 'VFEED_GROUP_BY_FEED', $owner_uid)) {
+				if ($vfeed_query_part && !$ignore_vfeed_group && get_pref('VFEED_GROUP_BY_FEED', $owner_uid)) {
 					if (!$override_order) {
 						$order_by = "ttrss_feeds.title, $order_by";
 					} else {
@@ -2589,7 +2589,7 @@
 
 				if ($_REQUEST["debug"]) print $query;
 
-				$result = db_query( $query);
+				$result = db_query($query);
 
 			} else {
 				// browsing by tag
@@ -2658,14 +2658,14 @@
 				// $tag_sql = "tag_name = '$feed'";   DEFAULT way
 
 				//				error_log("[". $select_qpart . "][" . $from_qpart . "][" .$where_qpart . "]");
-				$result = db_query( $select_qpart . $from_qpart . $where_qpart);
+				$result = db_query($select_qpart . $from_qpart . $where_qpart);
 			}
 
 			return array($result, $feed_title, $feed_site_url, $last_error);
 
 	}
 
-	function sanitize( $str, $force_remove_images = false, $owner = false, $site_url = false) {
+	function sanitize($str, $force_remove_images = false, $owner = false, $site_url = false) {
 		if (!$owner) $owner = $_SESSION["uid"];
 
 		$res = trim($str); if (!$res) return '';
@@ -2708,7 +2708,7 @@
 				}
 
 				if ($entry->nodeName == 'img') {
-					if (($owner && get_pref( "STRIP_IMAGES", $owner)) ||
+					if (($owner && get_pref("STRIP_IMAGES", $owner)) ||
 							$force_remove_images || $_SESSION["bw_limit"]) {
 
 						$p = $doc->createElement('p');
@@ -2825,7 +2825,7 @@
 		return false;
 	}
 
-	function catchupArticlesById( $ids, $cmode, $owner_uid = false) {
+	function catchupArticlesById($ids, $cmode, $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 		if (count($ids) == 0) return;
@@ -2839,32 +2839,32 @@
 		$ids_qpart = join(" OR ", $tmp_ids);
 
 		if ($cmode == 0) {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			unread = false,last_read = NOW()
 			WHERE ($ids_qpart) AND owner_uid = $owner_uid");
 		} else if ($cmode == 1) {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			unread = true
 			WHERE ($ids_qpart) AND owner_uid = $owner_uid");
 		} else {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			unread = NOT unread,last_read = NOW()
 			WHERE ($ids_qpart) AND owner_uid = $owner_uid");
 		}
 
 		/* update ccache */
 
-		$result = db_query( "SELECT DISTINCT feed_id FROM ttrss_user_entries
+		$result = db_query("SELECT DISTINCT feed_id FROM ttrss_user_entries
 			WHERE ($ids_qpart) AND owner_uid = $owner_uid");
 
 		while ($line = db_fetch_assoc($result)) {
-			ccache_update( $line["feed_id"], $owner_uid);
+			ccache_update($line["feed_id"], $owner_uid);
 		}
 	}
 
-	function get_article_tags( $id, $owner_uid = 0, $tag_cache = false) {
+	function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
 
-		$a_id = db_escape_string( $id);
+		$a_id = db_escape_string($id);
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -2879,7 +2879,7 @@
 		/* check cache first */
 
 		if ($tag_cache === false) {
-			$result = db_query( "SELECT tag_cache FROM ttrss_user_entries
+			$result = db_query("SELECT tag_cache FROM ttrss_user_entries
 				WHERE ref_id = '$id' AND owner_uid = $owner_uid");
 
 			$tag_cache = db_fetch_result($result, 0, "tag_cache");
@@ -2891,7 +2891,7 @@
 
 			/* do it the hard way */
 
-			$tmp_result = db_query( $query);
+			$tmp_result = db_query($query);
 
 			while ($tmp_line = db_fetch_assoc($tmp_result)) {
 				array_push($tags, $tmp_line["tag_name"]);
@@ -2899,9 +2899,9 @@
 
 			/* update the cache */
 
-			$tags_str = db_escape_string( join(",", $tags));
+			$tags_str = db_escape_string(join(",", $tags));
 
-			db_query( "UPDATE ttrss_user_entries
+			db_query("UPDATE ttrss_user_entries
 				SET tag_cache = '$tags_str' WHERE ref_id = '$id'
 				AND owner_uid = $owner_uid");
 		}
@@ -2972,7 +2972,7 @@
 		return vsprintf(__(array_shift($args)), $args);
 	}
 
-	function format_inline_player( $url, $ctype) {
+	function format_inline_player($url, $ctype) {
 
 		$entry = "";
 
@@ -3013,7 +3013,7 @@
 
 	}
 
-	function format_article( $id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
+	function format_article($id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
 		$rv = array();
@@ -3021,9 +3021,9 @@
 		$rv['id'] = $id;
 
 		/* we can figure out feed_id from article id anyway, why do we
-		 * pass feed_id here? let's ignore the argument :( */
+		 * pass feed_id here? let's ignore the argument :(*/
 
-		$result = db_query( "SELECT feed_id FROM ttrss_user_entries
+		$result = db_query("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = '$id'");
 
 		$feed_id = (int) db_fetch_result($result, 0, "feed_id");
@@ -3033,14 +3033,14 @@
 		//if (!$zoom_mode) { print "<article id='$id'><![CDATA["; };
 
 		if ($mark_as_read) {
-			$result = db_query( "UPDATE ttrss_user_entries
+			$result = db_query("UPDATE ttrss_user_entries
 				SET unread = false,last_read = NOW()
 				WHERE ref_id = '$id' AND owner_uid = $owner_uid");
 
-			ccache_update( $feed_id, $owner_uid);
+			ccache_update($feed_id, $owner_uid);
 		}
 
-		$result = db_query( "SELECT id,title,link,content,feed_id,comments,int_id,
+		$result = db_query("SELECT id,title,link,content,feed_id,comments,int_id,
 			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 			(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
 			(SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images,
@@ -3060,10 +3060,10 @@
 
 			$tag_cache = $line["tag_cache"];
 
-			$line["tags"] = get_article_tags( $id, $owner_uid, $line["tag_cache"]);
+			$line["tags"] = get_article_tags($id, $owner_uid, $line["tag_cache"]);
 			unset($line["tag_cache"]);
 
-			$line["content"] = sanitize( $line["content"], false, $owner_uid,	$line["site_url"]);
+			$line["content"] = sanitize($line["content"], false, $owner_uid,	$line["site_url"]);
 
 			global $pluginhost;
 
@@ -3106,7 +3106,7 @@
 				$entry_author = __(" - ") . $entry_author;
 			}
 
-			$parsed_updated = make_local_datetime( $line["updated"], true,
+			$parsed_updated = make_local_datetime($line["updated"], true,
 				$owner_uid, true);
 
 			$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
@@ -3163,7 +3163,7 @@
 
 			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) {
@@ -3199,7 +3199,7 @@
 			$rv['content'] .= "<div class=\"postContent\">";
 
 			$rv['content'] .= $line["content"];
-			$rv['content'] .= format_article_enclosures( $id,
+			$rv['content'] .= format_article_enclosures($id,
 				sql_bool_to_bool($line["always_display_enclosures"]),
 				$line["content"],
 				sql_bool_to_bool($line["hide_images"]));
@@ -3273,22 +3273,22 @@
 		}
 	} // function encrypt_password
 
-	function load_filters( $feed_id, $owner_uid, $action_id = false) {
+	function load_filters($feed_id, $owner_uid, $action_id = false) {
 		$filters = array();
 
-		$cat_id = (int)getFeedCategory( $feed_id);
+		$cat_id = (int)getFeedCategory($feed_id);
 
-		$result = db_query( "SELECT * FROM ttrss_filters2 WHERE
+		$result = db_query("SELECT * FROM ttrss_filters2 WHERE
 			owner_uid = $owner_uid AND enabled = true ORDER BY order_id, title");
 
 		$check_cats = join(",", array_merge(
-			getParentCategories( $cat_id, $owner_uid),
+			getParentCategories($cat_id, $owner_uid),
 			array($cat_id)));
 
 		while ($line = db_fetch_assoc($result)) {
 			$filter_id = $line["id"];
 
-			$result2 = db_query( "SELECT
+			$result2 = db_query("SELECT
 				r.reg_exp, r.inverse, r.feed_id, r.cat_id, r.cat_filter, t.name AS type_name
 				FROM ttrss_filters2_rules AS r,
 				ttrss_filter_types AS t
@@ -3311,7 +3311,7 @@
 				array_push($rules, $rule);
 			}
 
-			$result2 = db_query( "SELECT a.action_param,t.name AS type_name
+			$result2 = db_query("SELECT a.action_param,t.name AS type_name
 				FROM ttrss_filters2_actions AS a,
 				ttrss_filter_actions AS t
 				WHERE
@@ -3439,7 +3439,7 @@
 	}
 
 
-	function get_feed_category( $feed_cat, $parent_cat_id = false) {
+	function get_feed_category($feed_cat, $parent_cat_id = false) {
 		if ($parent_cat_id) {
 			$parent_qpart = "parent_cat = '$parent_cat_id'";
 			$parent_insert = "'$parent_cat_id'";
@@ -3459,11 +3459,11 @@
 		}
 	}
 
-	function add_feed_category( $feed_cat, $parent_cat_id = false) {
+	function add_feed_category($feed_cat, $parent_cat_id = false) {
 
 		if (!$feed_cat) return false;
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
 		if ($parent_cat_id) {
 			$parent_qpart = "parent_cat = '$parent_cat_id'";
@@ -3485,7 +3485,7 @@
 				"INSERT INTO ttrss_feed_categories (owner_uid,title,parent_cat)
 				VALUES ('".$_SESSION["uid"]."', '$feed_cat', $parent_insert)");
 
-			db_query( "COMMIT");
+			db_query("COMMIT");
 
 			return true;
 		}
@@ -3493,8 +3493,8 @@
 		return false;
 	}
 
-	function getArticleFeed( $id) {
-		$result = db_query( "SELECT feed_id FROM ttrss_user_entries
+	function getArticleFeed($id) {
+		$result = db_query("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
@@ -3539,14 +3539,14 @@
 
 	}
 
-	function get_article_enclosures( $id) {
+	function get_article_enclosures($id) {
 
 		$query = "SELECT * FROM ttrss_enclosures
 			WHERE post_id = '$id' AND content_url != ''";
 
 		$rv = array();
 
-		$result = db_query( $query);
+		$result = db_query($query);
 
 		if (db_num_rows($result) > 0) {
 			while ($line = db_fetch_assoc($result)) {
@@ -3557,7 +3557,7 @@
 		return $rv;
 	}
 
-	function save_email_address( $email) {
+	function save_email_address($email) {
 		// FIXME: implement persistent storage of emails
 
 		if (!$_SESSION['stored_emails'])
@@ -3568,22 +3568,22 @@
 	}
 
 
-	function get_feed_access_key( $feed_id, $is_cat, $owner_uid = false) {
+	function get_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) {
 			return db_fetch_result($result, 0, "access_key");
 		} else {
-			$key = db_escape_string( sha1(uniqid(rand(), true)));
+			$key = db_escape_string(sha1(uniqid(rand(), true)));
 
-			$result = db_query( "INSERT INTO ttrss_access_keys
+			$result = db_query("INSERT INTO ttrss_access_keys
 				(access_key, feed_id, is_cat, owner_uid)
 				VALUES ('$key', '$feed_id', $sql_is_cat, '$owner_uid')");
 
@@ -3627,9 +3627,9 @@
 		return is_html(fetch_file_contents($url, false, $login, $pass));
 	}
 
-	function print_label_select( $name, $value, $attributes = "") {
+	function print_label_select($name, $value, $attributes = "") {
 
-		$result = db_query( "SELECT caption FROM ttrss_labels2
+		$result = db_query("SELECT caption FROM ttrss_labels2
 			WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
 
 		print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
@@ -3651,10 +3651,10 @@
 
 	}
 
-	function format_article_enclosures( $id, $always_display_enclosures,
+	function format_article_enclosures($id, $always_display_enclosures,
 					$article_content, $hide_images = false) {
 
-		$result = get_article_enclosures( $id);
+		$result = get_article_enclosures($id);
 		$rv = '';
 
 		if (count($result) > 0) {
@@ -3672,7 +3672,7 @@
 
 				$filename = substr($url, strrpos($url, "/")+1);
 
-				$player = format_inline_player( $url, $ctype);
+				$player = format_inline_player($url, $ctype);
 
 				if ($player) array_push($entries_inline, $player);
 
@@ -3693,7 +3693,7 @@
 				array_push($entries, $entry);
 			}
 
-			if ($_SESSION['uid'] && !get_pref( "STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
+			if ($_SESSION['uid'] && !get_pref("STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
 				if ($always_display_enclosures ||
 							!preg_match("/<img/i", $article_content)) {
 
@@ -3738,7 +3738,7 @@
 	}
 
 	function getLastArticleId() {
-		$result = db_query( "SELECT MAX(ref_id) AS id FROM ttrss_user_entries
+		$result = db_query("SELECT MAX(ref_id) AS id FROM ttrss_user_entries
 			WHERE owner_uid = " . $_SESSION["uid"]);
 
 		if (db_num_rows($result) == 1) {
@@ -3824,7 +3824,7 @@
 		return $ids;
 	}
 
-	function cleanup_tags( $days = 14, $limit = 1000) {
+	function cleanup_tags($days = 14, $limit = 1000) {
 
 		if (DB_TYPE == "pgsql") {
 			$interval_query = "date_updated < NOW() - INTERVAL '$days days'";
@@ -3842,7 +3842,7 @@
 				WHERE post_int_id = int_id AND $interval_query AND
 				ref_id = ttrss_entries.id AND tag_cache != '' LIMIT $limit_part";
 
-			$result = db_query( $query);
+			$result = db_query($query);
 
 			$ids = array();
 
@@ -3853,8 +3853,8 @@
 			if (count($ids) > 0) {
 				$ids = join(",", $ids);
 
-				$tmp_result = db_query( "DELETE FROM ttrss_tags WHERE id IN ($ids)");
-				$tags_deleted += db_affected_rows( $tmp_result);
+				$tmp_result = db_query("DELETE FROM ttrss_tags WHERE id IN ($ids)");
+				$tags_deleted += db_affected_rows($tmp_result);
 			} else {
 				break;
 			}
@@ -3866,7 +3866,7 @@
 	}
 
 	function print_user_stylesheet() {
-		$value = get_pref( 'USER_STYLESHEET');
+		$value = get_pref('USER_STYLESHEET');
 
 		if ($value) {
 			print "<style type=\"text/css\">";
@@ -3922,7 +3922,7 @@
 			return $html;
 	}
 
-	function filter_to_sql( $filter, $owner_uid) {
+	function filter_to_sql($filter, $owner_uid) {
 		$query = array();
 
 		if (DB_TYPE == "pgsql")
@@ -3936,7 +3936,7 @@
 
 			if ($regexp_valid) {
 
-				$rule['reg_exp'] = db_escape_string( $rule['reg_exp']);
+				$rule['reg_exp'] = db_escape_string($rule['reg_exp']);
 
 					switch ($rule["type"]) {
 					case "title":
@@ -3969,13 +3969,13 @@
 				if (isset($rule['inverse'])) $qpart = "NOT ($qpart)";
 
 				if (isset($rule["feed_id"]) && $rule["feed_id"] > 0) {
-					$qpart .= " AND feed_id = " . db_escape_string( $rule["feed_id"]);
+					$qpart .= " AND feed_id = " . db_escape_string($rule["feed_id"]);
 				}
 
 				if (isset($rule["cat_id"])) {
 
 					if ($rule["cat_id"] > 0) {
-						$children = getChildCategories( $rule["cat_id"], $owner_uid);
+						$children = getChildCategories($rule["cat_id"], $owner_uid);
 						array_push($children, $rule["cat_id"]);
 
 						$children = join(",", $children);
@@ -4049,8 +4049,8 @@
        return $tempname;
 	}
 
-	function getFeedCategory( $feed) {
-		$result = db_query( "SELECT cat_id FROM ttrss_feeds
+	function getFeedCategory($feed) {
+		$result = db_query("SELECT cat_id FROM ttrss_feeds
 			WHERE id = '$feed'");
 
 		if (db_num_rows($result) > 0) {
diff --git a/include/labels.php b/include/labels.php
index fc23fca93..c2a48a338 100644
--- a/include/labels.php
+++ b/include/labels.php
@@ -1,5 +1,5 @@
 <?php
-	function label_find_id( $label, $owner_uid) {
+	function label_find_id($label, $owner_uid) {
 		$result = db_query(
 			"SELECT id FROM ttrss_labels2 WHERE caption = '$label'
 				AND owner_uid = '$owner_uid' LIMIT 1");
@@ -11,12 +11,12 @@
 		}
 	}
 
-	function get_article_labels( $id, $owner_uid = false) {
+	function get_article_labels($id, $owner_uid = false) {
 		$rv = array();
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$result = db_query( "SELECT label_cache FROM
+		$result = db_query("SELECT label_cache FROM
 			ttrss_user_entries WHERE ref_id = '$id' AND owner_uid = " .
 			$owner_uid);
 
@@ -48,15 +48,15 @@
 		}
 
 		if (count($rv) > 0)
-			label_update_cache( $owner_uid, $id, $rv);
+			label_update_cache($owner_uid, $id, $rv);
 		else
-			label_update_cache( $owner_uid, $id, array("no-labels" => 1));
+			label_update_cache($owner_uid, $id, array("no-labels" => 1));
 
 		return $rv;
 	}
 
 
-	function label_find_caption( $label, $owner_uid) {
+	function label_find_caption($label, $owner_uid) {
 		$result = db_query(
 			"SELECT caption FROM ttrss_labels2 WHERE id = '$label'
 				AND owner_uid = '$owner_uid' LIMIT 1");
@@ -68,10 +68,10 @@
 		}
 	}
 
-	function get_all_labels( $owner_uid) {
+	function get_all_labels($owner_uid) {
 		$rv = array();
 
-		$result = db_query( "SELECT fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = " . $owner_uid);
+		$result = db_query("SELECT fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = " . $owner_uid);
 
 		while ($line = db_fetch_assoc($result)) {
 			array_push($rv, $line);
@@ -80,31 +80,31 @@
 		return $rv;
 	}
 
-	function label_update_cache( $owner_uid, $id, $labels = false, $force = false) {
+	function label_update_cache($owner_uid, $id, $labels = false, $force = false) {
 
 		if ($force)
-			label_clear_cache( $id);
+			label_clear_cache($id);
 
 		if (!$labels)
-			$labels = get_article_labels( $id);
+			$labels = get_article_labels($id);
 
-		$labels = db_escape_string( json_encode($labels));
+		$labels = db_escape_string(json_encode($labels));
 
-		db_query( "UPDATE ttrss_user_entries SET
+		db_query("UPDATE ttrss_user_entries SET
 			label_cache = '$labels' WHERE ref_id = '$id' AND  owner_uid = '$owner_uid'");
 
 	}
 
-	function label_clear_cache( $id) {
+	function label_clear_cache($id) {
 
-		db_query( "UPDATE ttrss_user_entries SET
+		db_query("UPDATE ttrss_user_entries SET
 			label_cache = '' WHERE ref_id = '$id'");
 
 	}
 
-	function label_remove_article( $id, $label, $owner_uid) {
+	function label_remove_article($id, $label, $owner_uid) {
 
-		$label_id = label_find_id( $label, $owner_uid);
+		$label_id = label_find_id($label, $owner_uid);
 
 		if (!$label_id) return;
 
@@ -114,12 +114,12 @@
 				label_id = '$label_id' AND
 				article_id = '$id'");
 
-		label_clear_cache( $id);
+		label_clear_cache($id);
 	}
 
-	function label_add_article( $id, $label, $owner_uid) {
+	function label_add_article($id, $label, $owner_uid) {
 
-		$label_id = label_find_id( $label, $owner_uid);
+		$label_id = label_find_id($label, $owner_uid);
 
 		if (!$label_id) return;
 
@@ -133,55 +133,55 @@
 			LIMIT 1");
 
 		if (db_num_rows($result) == 0) {
-			db_query( "INSERT INTO ttrss_user_labels2
+			db_query("INSERT INTO ttrss_user_labels2
 				(label_id, article_id) VALUES ('$label_id', '$id')");
 		}
 
-		label_clear_cache( $id);
+		label_clear_cache($id);
 
 	}
 
-	function label_remove( $id, $owner_uid) {
+	function label_remove($id, $owner_uid) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		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'");
 
 		$caption = db_fetch_result($result, 0, "caption");
 
-		$result = db_query( "DELETE FROM ttrss_labels2 WHERE id = '$id'
+		$result = db_query("DELETE FROM ttrss_labels2 WHERE id = '$id'
 			AND owner_uid = " . $owner_uid);
 
-		if (db_affected_rows( $result) != 0 && $caption) {
+		if (db_affected_rows($result) != 0 && $caption) {
 
 			/* Remove access key for the label */
 
 			$ext_id = LABEL_BASE_INDEX - 1 - $id;
 
-			db_query( "DELETE FROM ttrss_access_keys WHERE
+			db_query("DELETE FROM ttrss_access_keys WHERE
 				feed_id = '$ext_id' AND owner_uid = $owner_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 = " . $owner_uid);
 
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 	}
 
-	function label_create( $caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
+	function label_create($caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
 		$result = false;
 
-		$result = db_query( "SELECT id FROM ttrss_labels2
+		$result = db_query("SELECT id FROM ttrss_labels2
 			WHERE caption = '$caption' AND owner_uid = $owner_uid");
 
 		if (db_num_rows($result) == 0) {
@@ -189,10 +189,10 @@
 				"INSERT INTO ttrss_labels2 (caption,owner_uid,fg_color,bg_color)
 					VALUES ('$caption', '$owner_uid', '$fg_color', '$bg_color')");
 
-			$result = db_affected_rows( $result) != 0;
+			$result = db_affected_rows($result) != 0;
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 
 		return $result;
 	}
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index ba2890669..bebc1c1f9 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -5,30 +5,30 @@
 
 	function update_feedbrowser_cache() {
 
-		$result = db_query( "SELECT feed_url, site_url, title, COUNT(id) AS subscribers
+		$result = db_query("SELECT feed_url, site_url, title, COUNT(id) AS subscribers
 	  		FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
 				WHERE tf.feed_url = ttrss_feeds.feed_url
 				AND (private IS true OR auth_login != '' OR auth_pass != '' OR feed_url LIKE '%:%@%/%'))
 				GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT 1000");
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
-		db_query( "DELETE FROM ttrss_feedbrowser_cache");
+		db_query("DELETE FROM ttrss_feedbrowser_cache");
 
 		$count = 0;
 
 		while ($line = db_fetch_assoc($result)) {
-			$subscribers = db_escape_string( $line["subscribers"]);
-			$feed_url = db_escape_string( $line["feed_url"]);
-			$title = db_escape_string( $line["title"]);
-			$site_url = db_escape_string( $line["site_url"]);
+			$subscribers = db_escape_string($line["subscribers"]);
+			$feed_url = db_escape_string($line["feed_url"]);
+			$title = db_escape_string($line["title"]);
+			$site_url = db_escape_string($line["site_url"]);
 
-			$tmp_result = db_query( "SELECT subscribers FROM
+			$tmp_result = db_query("SELECT subscribers FROM
 				ttrss_feedbrowser_cache WHERE feed_url = '$feed_url'");
 
 			if (db_num_rows($tmp_result) == 0) {
 
-				db_query( "INSERT INTO ttrss_feedbrowser_cache
+				db_query("INSERT INTO ttrss_feedbrowser_cache
 					(feed_url, site_url, title, subscribers) VALUES ('$feed_url',
 						'$site_url', '$title', '$subscribers')");
 
@@ -38,7 +38,7 @@
 
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 
 		return $count;
 
@@ -57,7 +57,7 @@
 	 * @param boolean $debug Set to false to disable debug output. Default to true.
 	 * @return void
 	 */
-	function update_daemon_common( $limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) {
+	function update_daemon_common($limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) {
 		// Process all other feeds using last_updated and interval parameters
 
 		$schema_version = get_schema_version();
@@ -116,7 +116,7 @@
 		$random_qpart = sql_random_function();
 
 		// We search for feed needing update.
-		$result = db_query( "SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart
+		$result = db_query("SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -134,7 +134,7 @@
 		// Here is a little cache magic in order to minimize risk of double feed updates.
 		$feeds_to_update = array();
 		while ($line = db_fetch_assoc($result)) {
-			array_push($feeds_to_update, db_escape_string( $line['feed_url']));
+			array_push($feeds_to_update, db_escape_string($line['feed_url']));
 		}
 
 		// We update the feed last update started date before anything else.
@@ -145,16 +145,16 @@
 			$feeds_quoted = array();
 
 			foreach ($feeds_to_update as $feed) {
-				array_push($feeds_quoted, "'" . db_escape_string( $feed) . "'");
+				array_push($feeds_quoted, "'" . db_escape_string($feed) . "'");
 			}
 
-			db_query( sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
+			db_query(sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
 				WHERE feed_url IN (%s)", implode(',', $feeds_quoted)));
 		}
 
 		expire_cached_files($debug);
 		expire_lock_files($debug);
-		expire_error_log( $debug);
+		expire_error_log($debug);
 
 		$nf = 0;
 
@@ -162,16 +162,16 @@
 		foreach ($feeds_to_update as $feed) {
 			if($debug) _debug("Base feed: $feed");
 
-			//update_rss_feed( $line["id"], true);
+			//update_rss_feed($line["id"], true);
 
 			// since we have the data cached, we can deal with other feeds with the same url
 
-			$tmp_result = db_query( "SELECT DISTINCT ttrss_feeds.id,last_updated
+			$tmp_result = db_query("SELECT DISTINCT ttrss_feeds.id,last_updated
 			FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
 				ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
 				ttrss_users.id = ttrss_user_prefs.owner_uid AND
 				ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND
-				feed_url = '".db_escape_string( $feed)."' AND
+				feed_url = '".db_escape_string($feed)."' AND
 				(ttrss_feeds.update_interval > 0 OR
 					ttrss_user_prefs.value != '-1')
 				$login_thresh_qpart
@@ -180,7 +180,7 @@
 			if (db_num_rows($tmp_result) > 0) {
 				while ($tline = db_fetch_assoc($tmp_result)) {
 					if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"]);
-					update_rss_feed( $tline["id"], true);
+					update_rss_feed($tline["id"], true);
 					++$nf;
 				}
 			}
@@ -189,14 +189,14 @@
 		require_once "digest.php";
 
 		// Send feed digests by email if needed.
-		send_headlines_digests( $debug);
+		send_headlines_digests($debug);
 
 		return $nf;
 
 	} // function update_daemon_common
 
 	// ignore_daemon is not used
-	function update_rss_feed( $feed, $ignore_daemon = false, $no_cache = false,
+	function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false,
 		$override_url = false) {
 
 		require_once "lib/simplepie/simplepie.inc";
@@ -207,7 +207,7 @@
 			_debug("update_rss_feed: start");
 		}
 
-		$result = db_query( "SELECT id,update_interval,auth_login,
+		$result = db_query("SELECT id,update_interval,auth_login,
 			feed_url,auth_pass,cache_images,last_updated,
 			mark_unread_on_update, owner_uid,
 			pubsub_state, auth_pass_encrypted
@@ -228,7 +228,7 @@
 		$auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result,
 			0, "auth_pass_encrypted"));
 
-		db_query( "UPDATE ttrss_feeds SET last_update_started = NOW()
+		db_query("UPDATE ttrss_feeds SET last_update_started = NOW()
 			WHERE id = '$feed'");
 
 		$auth_login = db_fetch_result($result, 0, "auth_login");
@@ -242,7 +242,7 @@
 		$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
 		$fetch_url = db_fetch_result($result, 0, "feed_url");
 
-		$feed = db_escape_string( $feed);
+		$feed = db_escape_string($feed);
 
 		if ($override_url) $fetch_url = $override_url;
 
@@ -252,7 +252,7 @@
 
 		// Ignore cache if new feed or manual update.
 		$cache_age = ($no_cache || is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ?
-			30 : get_feed_update_interval( $feed) * 60;
+			30 : get_feed_update_interval($feed) * 60;
 
 		if ($debug_enabled) {
 			_debug("update_rss_feed: cache filename: $cache_filename exists: " . file_exists($cache_filename));
@@ -322,7 +322,7 @@
 
 				// If-Modified-Since
 				if ($fetch_last_error_code != 304) {
-					$error_escaped = db_escape_string( $fetch_last_error);
+					$error_escaped = db_escape_string($fetch_last_error);
 				} else {
 					if ($debug_enabled) {
 						_debug("update_rss_feed: source claims data not modified, nothing to do.");
@@ -339,7 +339,7 @@
 
 		$pluginhost = new PluginHost(Db::get());
 		$pluginhost->set_debug($debug_enabled);
-		$user_plugins = get_pref( "_ENABLED_PLUGINS", $owner_uid);
+		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
 		$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
 		$pluginhost->load($user_plugins, $pluginhost::KIND_USER, $owner_uid);
@@ -364,7 +364,7 @@
 
 //		print_r($rss);
 
-		$feed = db_escape_string( $feed);
+		$feed = db_escape_string($feed);
 
 		if (!$rss->error()) {
 
@@ -388,7 +388,7 @@
 				_debug("update_rss_feed: processing feed data...");
 			}
 
-//			db_query( "BEGIN");
+//			db_query("BEGIN");
 
 			if (DB_TYPE == "pgsql") {
 				$favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'";
@@ -396,7 +396,7 @@
 				$favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
 			}
 
-			$result = db_query( "SELECT title,site_url,owner_uid,
+			$result = db_query("SELECT title,site_url,owner_uid,
 				(favicon_last_checked IS NULL OR $favicon_interval_qpart) AS
 						favicon_needs_check
 				FROM ttrss_feeds WHERE id = '$feed'");
@@ -408,7 +408,7 @@
 
 			$owner_uid = db_fetch_result($result, 0, "owner_uid");
 
-			$site_url = db_escape_string( mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
+			$site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
 
 			if ($favicon_needs_check || $force_refetch) {
 				if ($debug_enabled) {
@@ -427,25 +427,25 @@
 						$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
 				}
 
-				db_query( "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
+				db_query("UPDATE ttrss_feeds SET favicon_last_checked = NOW()
 					$favicon_colorstring
 					WHERE id = '$feed'");
 			}
 
 			if (!$registered_title || $registered_title == "[Unknown]") {
 
-				$feed_title = db_escape_string( $rss->get_title());
+				$feed_title = db_escape_string($rss->get_title());
 
 				if ($debug_enabled) {
 					_debug("update_rss_feed: registering title: $feed_title");
 				}
 
-				db_query( "UPDATE ttrss_feeds SET
+				db_query("UPDATE ttrss_feeds SET
 					title = '$feed_title' WHERE id = '$feed'");
 			}
 
 			if ($site_url && $orig_site_url != $site_url) {
-				db_query( "UPDATE ttrss_feeds SET
+				db_query("UPDATE ttrss_feeds SET
 					site_url = '$site_url' WHERE id = '$feed'");
 			}
 
@@ -453,8 +453,8 @@
 				_debug("update_rss_feed: loading filters & labels...");
 			}
 
-			$filters = load_filters( $feed, $owner_uid);
-			$labels = get_all_labels( $owner_uid);
+			$filters = load_filters($feed, $owner_uid);
+			$labels = get_all_labels($owner_uid);
 
 			if ($debug_enabled) {
 				//print_r($filters);
@@ -468,7 +468,7 @@
 					_debug("update_rss_feed: no articles found.");
 				}
 
-				db_query( "UPDATE ttrss_feeds
+				db_query("UPDATE ttrss_feeds
 					SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
 
 				return; // no articles
@@ -506,7 +506,7 @@
 					if ($debug_enabled)
 						_debug("update_rss_feed: feed hub url found, subscribe request sent.");
 
-					db_query( "UPDATE ttrss_feeds SET pubsub_state = 1
+					db_query("UPDATE ttrss_feeds SET pubsub_state = 1
 						WHERE id = '$feed'");
 				}
 			}
@@ -528,7 +528,7 @@
 
 				$entry_guid = "$owner_uid,$entry_guid";
 
-				$entry_guid_hashed = db_escape_string( 'SHA1:' . sha1($entry_guid));
+				$entry_guid_hashed = db_escape_string('SHA1:' . sha1($entry_guid));
 
 				if ($debug_enabled) {
 					_debug("update_rss_feed: guid $entry_guid / $entry_guid_hashed");
@@ -578,13 +578,13 @@
 					$entry_author = $entry_author_item->get_name();
 					if (!$entry_author) $entry_author = $entry_author_item->get_email();
 
-					$entry_author = db_escape_string( $entry_author);
+					$entry_author = db_escape_string($entry_author);
 				}
 
-				$entry_guid = db_escape_string( mb_substr($entry_guid, 0, 245));
+				$entry_guid = db_escape_string(mb_substr($entry_guid, 0, 245));
 
-				$entry_comments = db_escape_string( mb_substr($entry_comments, 0, 245));
-				$entry_author = db_escape_string( mb_substr($entry_author, 0, 245));
+				$entry_comments = db_escape_string(mb_substr($entry_comments, 0, 245));
+				$entry_author = db_escape_string(mb_substr($entry_author, 0, 245));
 
 				$num_comments = $item->get_item_tags('http://purl.org/rss/1.0/modules/slash/', 'comments');
 
@@ -641,8 +641,8 @@
 				}
 
 				// FIXME not sure if owner_uid is a good idea here, we may have a base entry without user entry (?)
-				$result = db_query( "SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries
-					WHERE ref_id = id AND (guid = '".db_escape_string( $entry_guid)."' OR guid = '$entry_guid_hashed') AND owner_uid = $owner_uid");
+				$result = db_query("SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries
+					WHERE ref_id = id AND (guid = '".db_escape_string($entry_guid)."' OR guid = '$entry_guid_hashed') AND owner_uid = $owner_uid");
 
 				if (db_num_rows($result) != 0) {
 					$entry_plugin_data = db_fetch_result($result, 0, "plugin_data");
@@ -671,11 +671,11 @@
 				}
 
 				$entry_tags = $article["tags"];
-				$entry_guid = db_escape_string( $entry_guid);
-				$entry_title = db_escape_string( $article["title"]);
-				$entry_author = db_escape_string( $article["author"]);
-				$entry_link = db_escape_string( $article["link"]);
-				$entry_plugin_data = db_escape_string( $article["plugin_data"]);
+				$entry_guid = db_escape_string($entry_guid);
+				$entry_title = db_escape_string($article["title"]);
+				$entry_author = db_escape_string($article["author"]);
+				$entry_link = db_escape_string($article["link"]);
+				$entry_plugin_data = db_escape_string($article["plugin_data"]);
 				$entry_content = $article["content"]; // escaped below
 
 
@@ -686,13 +686,13 @@
 				if ($cache_images && is_writable(CACHE_DIR . '/images'))
 					cache_images($entry_content, $site_url, $debug_enabled);
 
-				$entry_content = db_escape_string( $entry_content, false);
+				$entry_content = db_escape_string($entry_content, false);
 
 				$content_hash = "SHA1:" . sha1($entry_content);
 
-				db_query( "BEGIN");
+				db_query("BEGIN");
 
-				$result = db_query( "SELECT id FROM	ttrss_entries
+				$result = db_query("SELECT id FROM	ttrss_entries
 					WHERE (guid = '$entry_guid' OR guid = '$entry_guid_hashed')");
 
 				if (db_num_rows($result) == 0) {
@@ -745,15 +745,15 @@
 
 					$base_entry_id = db_fetch_result($result, 0, "id");
 
-					db_query( "UPDATE ttrss_entries SET date_updated = NOW()
+					db_query("UPDATE ttrss_entries SET date_updated = NOW()
 						WHERE id = '$base_entry_id'");
 
-					$article_labels = get_article_labels( $base_entry_id, $owner_uid);
+					$article_labels = get_article_labels($base_entry_id, $owner_uid);
 				}
 
 				// now it should exist, if not - bad luck then
 
-				$result = db_query( "SELECT
+				$result = db_query("SELECT
 						id,content_hash,no_orig_date,title,plugin_data,guid,
 						".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated,
 						".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
@@ -786,14 +786,14 @@
 					if ($stored_guid != $entry_guid_hashed) {
 						if ($debug_enabled) _debug("upgrading compat guid to hashed one");
 
-						db_query( "UPDATE ttrss_entries SET guid = '$entry_guid_hashed' WHERE
+						db_query("UPDATE ttrss_entries SET guid = '$entry_guid_hashed' WHERE
 							id = '$ref_id'");
 					} */
 
 					// check for user post link to main table
 
 					// do we allow duplicate posts with same GUID in different feeds?
-					if (get_pref( "ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
+					if (get_pref("ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
 						$dupcheck_qpart = "AND (feed_id = '$feed' OR feed_id IS NULL)";
 					} else {
 						$dupcheck_qpart = "";
@@ -813,7 +813,7 @@
 					}
 
 					if (find_article_filter($article_filters, "filter")) {
-						db_query( "COMMIT"); // close transaction in progress
+						db_query("COMMIT"); // close transaction in progress
 						continue;
 					}
 
@@ -829,7 +829,7 @@
 
 //					if ($_REQUEST["xdebug"]) print "$query\n";
 
-					$result = db_query( $query);
+					$result = db_query($query);
 
 					// okay it doesn't exist - create user entry
 					if (db_num_rows($result) == 0) {
@@ -862,7 +862,7 @@
 
 						if (DB_TYPE == "pgsql" and defined('_NGRAM_TITLE_DUPLICATE_THRESHOLD')) {
 
-							$result = db_query( "SELECT COUNT(*) AS similar FROM
+							$result = db_query("SELECT COUNT(*) AS similar FROM
 									ttrss_entries,ttrss_user_entries
 								WHERE ref_id = id AND updated >= NOW() - INTERVAL '7 day'
 									AND similarity(title, '$entry_title') >= "._NGRAM_TITLE_DUPLICATE_THRESHOLD."
@@ -894,7 +894,7 @@
 						if (PUBSUBHUBBUB_HUB && $published == 'true') {
 							$rss_link = 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);
 
 							$p = new Publisher(PUBSUBHUBBUB_HUB);
 
@@ -940,7 +940,7 @@
 						$update_insignificant = false;
 					}
 
-					if (db_escape_string( $orig_title) != $entry_title) {
+					if (db_escape_string($orig_title) != $entry_title) {
 						$post_needs_update = true;
 						$update_insignificant = false;
 					}
@@ -955,7 +955,7 @@
 
 //						print "<!-- post $orig_title needs update : $post_needs_update -->";
 
-						db_query( "UPDATE ttrss_entries
+						db_query("UPDATE ttrss_entries
 							SET title = '$entry_title', content = '$entry_content',
 								content_hash = '$content_hash',
 								updated = '$entry_timestamp_fmt',
@@ -965,20 +965,20 @@
 
 						if (!$update_insignificant) {
 							if ($mark_unread_on_update) {
-								db_query( "UPDATE ttrss_user_entries
+								db_query("UPDATE ttrss_user_entries
 									SET last_read = null, unread = true WHERE ref_id = '$ref_id'");
 							}
 						}
 					}
 				}
 
-				db_query( "COMMIT");
+				db_query("COMMIT");
 
 				if ($debug_enabled) {
 					_debug("update_rss_feed: assigning labels...");
 				}
 
-				assign_article_to_label_filters( $entry_ref_id, $article_filters,
+				assign_article_to_label_filters($entry_ref_id, $article_filters,
 					$owner_uid, $article_labels);
 
 				if ($debug_enabled) {
@@ -1004,24 +1004,24 @@
 					print_r($enclosures);
 				}
 
-				db_query( "BEGIN");
+				db_query("BEGIN");
 
 				foreach ($enclosures as $enc) {
-					$enc_url = db_escape_string( $enc[0]);
-					$enc_type = db_escape_string( $enc[1]);
-					$enc_dur = db_escape_string( $enc[2]);
+					$enc_url = db_escape_string($enc[0]);
+					$enc_type = db_escape_string($enc[1]);
+					$enc_dur = db_escape_string($enc[2]);
 
-					$result = db_query( "SELECT id FROM ttrss_enclosures
+					$result = db_query("SELECT id FROM ttrss_enclosures
 						WHERE content_url = '$enc_url' AND post_id = '$entry_ref_id'");
 
 					if (db_num_rows($result) == 0) {
-						db_query( "INSERT INTO ttrss_enclosures
+						db_query("INSERT INTO ttrss_enclosures
 							(content_url, content_type, title, duration, post_id) VALUES
 							('$enc_url', '$enc_type', '', '$enc_dur', '$entry_ref_id')");
 					}
 				}
 
-				db_query( "COMMIT");
+				db_query("COMMIT");
 
 				// check for manual tags (we have to do it here since they're loaded from filters)
 
@@ -1065,22 +1065,22 @@
 
 				if (count($filtered_tags) > 0) {
 
-					db_query( "BEGIN");
+					db_query("BEGIN");
 
 					foreach ($filtered_tags as $tag) {
 
 						$tag = sanitize_tag($tag);
-						$tag = db_escape_string( $tag);
+						$tag = db_escape_string($tag);
 
 						if (!tag_is_valid($tag)) continue;
 
-						$result = db_query( "SELECT id FROM ttrss_tags
+						$result = db_query("SELECT id FROM ttrss_tags
 							WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND
 							owner_uid = '$owner_uid' LIMIT 1");
 
 							if ($result && db_num_rows($result) == 0) {
 
-								db_query( "INSERT INTO ttrss_tags
+								db_query("INSERT INTO ttrss_tags
 									(owner_uid,tag_name,post_int_id)
 									VALUES ('$owner_uid','$tag', '$entry_int_id')");
 							}
@@ -1092,16 +1092,16 @@
 
 					$tags_to_cache = array_unique($tags_to_cache);
 
-					$tags_str = db_escape_string( join(",", $tags_to_cache));
+					$tags_str = db_escape_string(join(",", $tags_to_cache));
 
-					db_query( "UPDATE ttrss_user_entries
+					db_query("UPDATE ttrss_user_entries
 						SET tag_cache = '$tags_str' WHERE ref_id = '$entry_ref_id'
 						AND owner_uid = $owner_uid");
 
-					db_query( "COMMIT");
+					db_query("COMMIT");
 				}
 
-				if (get_pref( "AUTO_ASSIGN_LABELS", $owner_uid, false)) {
+				if (get_pref("AUTO_ASSIGN_LABELS", $owner_uid, false)) {
 					if ($debug_enabled) {
 						_debug("update_rss_feed: auto-assigning labels...");
 					}
@@ -1111,7 +1111,7 @@
 
 						if ($caption && preg_match("/\b$caption\b/i", "$tags_str " . strip_tags($entry_content) . " $entry_title")) {
 							if (!labels_contains_caption($article_labels, $caption)) {
-								label_add_article( $entry_ref_id, $caption, $owner_uid);
+								label_add_article($entry_ref_id, $caption, $owner_uid);
 							}
 						}
 					}
@@ -1126,23 +1126,23 @@
 				if ($debug_enabled) {
 					_debug("update_rss_feed: new feed, catching it up...");
 				}
-				catchup_feed( $feed, false, $owner_uid);
+				catchup_feed($feed, false, $owner_uid);
 			}
 
 			if ($debug_enabled) {
 				_debug("purging feed...");
 			}
 
-			purge_feed( $feed, 0, $debug_enabled);
+			purge_feed($feed, 0, $debug_enabled);
 
-			db_query( "UPDATE ttrss_feeds
+			db_query("UPDATE ttrss_feeds
 				SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
 
-//			db_query( "COMMIT");
+//			db_query("COMMIT");
 
 		} else {
 
-			$error_msg = db_escape_string( mb_substr($rss->error(), 0, 245));
+			$error_msg = db_escape_string(mb_substr($rss->error(), 0, 245));
 
 			if ($debug_enabled) {
 				_debug("update_rss_feed: error fetching feed: $error_msg");
@@ -1204,14 +1204,14 @@
 		return $doc->saveXML($node);
 	}
 
-	function expire_error_log( $debug) {
+	function expire_error_log($debug) {
 		if ($debug) _debug("Removing old error log entries...");
 
 		if (DB_TYPE == "pgsql") {
-			db_query( "DELETE FROM ttrss_error_log
+			db_query("DELETE FROM ttrss_error_log
 				WHERE created_at < NOW() - INTERVAL '7 days'");
 		} else {
-			db_query( "DELETE FROM ttrss_error_log
+			db_query("DELETE FROM ttrss_error_log
 				WHERE created_at < DATE_SUB(NOW(), INTERVAL 7 DAY)");
 		}
 
@@ -1399,11 +1399,11 @@
 		return false;
 	}
 
-	function assign_article_to_label_filters( $id, $filters, $owner_uid, $article_labels) {
+	function assign_article_to_label_filters($id, $filters, $owner_uid, $article_labels) {
 		foreach ($filters as $f) {
 			if ($f["type"] == "label") {
 				if (!labels_contains_caption($article_labels, $f["param"])) {
-					label_add_article( $id, $f["param"], $owner_uid);
+					label_add_article($id, $f["param"], $owner_uid);
 				}
 			}
 		}
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 0477efd50..a5c682be8 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -88,7 +88,7 @@
 			}
 
 			if (SINGLE_USER_MODE) {
-				$result = db_query( "SELECT id FROM ttrss_users WHERE id = 1");
+				$result = db_query("SELECT id FROM ttrss_users WHERE id = 1");
 
 				if (db_num_rows($result) != 1) {
 					array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
diff --git a/include/sanity_config.php b/include/sanity_config.php
index 398c979fe..d5cfd2d78 100644
--- a/include/sanity_config.php
+++ b/include/sanity_config.php
@@ -1,3 +1,3 @@
 <?php # This file has been generated at:  Tue Apr 16 16:41:13 MSK 2013
 define('GENERATED_CONFIG_CHECK', 26);
-$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>
+$requred_defines = array('DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>
diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php
index b6d8e97dc..c6f075036 100644
--- a/plugins/auth_internal/init.php
+++ b/plugins/auth_internal/init.php
@@ -19,12 +19,12 @@ class Auth_Internal extends Plugin implements IAuthModule {
 
 		$pwd_hash1 = encrypt_password($password);
 		$pwd_hash2 = encrypt_password($password, $login);
-		$login = db_escape_string( $login);
-		$otp = db_escape_string( $_REQUEST["otp"]);
+		$login = db_escape_string($login);
+		$otp = db_escape_string($_REQUEST["otp"]);
 
 		if (get_schema_version() > 96) {
 			if (!defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) {
-				$result = db_query( "SELECT otp_enabled,salt FROM ttrss_users WHERE
+				$result = db_query("SELECT otp_enabled,salt FROM ttrss_users WHERE
 					login = '$login'");
 
 				if (db_num_rows($result) > 0) {
@@ -74,7 +74,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
 
 		if (get_schema_version() > 87) {
 
-			$result = db_query( "SELECT salt FROM ttrss_users WHERE
+			$result = db_query("SELECT salt FROM ttrss_users WHERE
 				login = '$login'");
 
 			if (db_num_rows($result) != 1) {
@@ -92,7 +92,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
 
 				// verify and upgrade password to new salt base
 
-				$result = db_query( $query);
+				$result = db_query($query);
 
 				if (db_num_rows($result) == 1) {
 					// upgrade password to MODE2
@@ -100,7 +100,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
 					$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 					$pwd_hash = encrypt_password($password, $salt, true);
 
-					db_query( "UPDATE ttrss_users SET
+					db_query("UPDATE ttrss_users SET
 						pwd_hash = '$pwd_hash', salt = '$salt' WHERE login = '$login'");
 
 					$query = "SELECT id
@@ -128,7 +128,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
 					pwd_hash = '$pwd_hash2')";
 		}
 
-		$result = db_query( $query);
+		$result = db_query($query);
 
 		if (db_num_rows($result) == 1) {
 			return db_fetch_result($result, 0, "id");
@@ -138,9 +138,9 @@ class Auth_Internal extends Plugin implements IAuthModule {
 	}
 
 	function check_password($owner_uid, $password) {
-		$owner_uid = db_escape_string( $owner_uid);
+		$owner_uid = db_escape_string($owner_uid);
 
-		$result = db_query( "SELECT salt,login FROM ttrss_users WHERE
+		$result = db_query("SELECT salt,login FROM ttrss_users WHERE
 			id = '$owner_uid'");
 
 		$salt = db_fetch_result($result, 0, "salt");
@@ -161,20 +161,20 @@ class Auth_Internal extends Plugin implements IAuthModule {
 				id = '$owner_uid' AND pwd_hash = '$password_hash'";
 		}
 
-		$result = db_query( $query);
+		$result = db_query($query);
 
 		return db_num_rows($result) != 0;
 	}
 
 	function change_password($owner_uid, $old_password, $new_password) {
-		$owner_uid = db_escape_string( $owner_uid);
+		$owner_uid = db_escape_string($owner_uid);
 
 		if ($this->check_password($owner_uid, $old_password)) {
 
 			$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 			$new_password_hash = encrypt_password($new_password, $new_salt, true);
 
-			db_query( "UPDATE ttrss_users SET
+			db_query("UPDATE ttrss_users SET
 				pwd_hash = '$new_password_hash', salt = '$new_salt', otp_enabled = false
 					WHERE id = '$owner_uid'");
 
diff --git a/plugins/auth_remote/init.php b/plugins/auth_remote/init.php
index f0da1afc8..a551c6bd0 100644
--- a/plugins/auth_remote/init.php
+++ b/plugins/auth_remote/init.php
@@ -19,15 +19,15 @@ class Auth_Remote extends Plugin implements IAuthModule {
 	}
 
 	function get_login_by_ssl_certificate() {
-		$cert_serial = db_escape_string( get_ssl_certificate_id());
+		$cert_serial = db_escape_string(get_ssl_certificate_id());
 
 		if ($cert_serial) {
-			$result = db_query( "SELECT login FROM ttrss_user_prefs, ttrss_users
+			$result = db_query("SELECT login FROM ttrss_user_prefs, ttrss_users
 				WHERE pref_name = 'SSL_CERT_SERIAL' AND value = '$cert_serial' AND
 				owner_uid = ttrss_users.id");
 
 			if (db_num_rows($result) != 0) {
-				return db_escape_string( db_fetch_result($result, 0, "login"));
+				return db_escape_string(db_fetch_result($result, 0, "login"));
 			}
 		}
 
@@ -36,10 +36,10 @@ class Auth_Remote extends Plugin implements IAuthModule {
 
 
 	function authenticate($login, $password) {
-		$try_login = db_escape_string( $_SERVER["REMOTE_USER"]);
+		$try_login = db_escape_string($_SERVER["REMOTE_USER"]);
 
 		// php-cgi
-		if (!$try_login) $try_login = db_escape_string( $_SERVER["REDIRECT_REMOTE_USER"]);
+		if (!$try_login) $try_login = db_escape_string($_SERVER["REDIRECT_REMOTE_USER"]);
 
 		if (!$try_login) $try_login = $this->get_login_by_ssl_certificate();
 #	  	if (!$try_login) $try_login = "test_qqq";
@@ -58,15 +58,15 @@ class Auth_Remote extends Plugin implements IAuthModule {
 					// update user name
 					$fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN'];
 					if ($fullname){
-						$fullname = db_escape_string( $fullname);
-						db_query( "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " .
+						$fullname = db_escape_string($fullname);
+						db_query("UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " .
 							$user_id);
 					}
 					// update user mail
 					$email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL'];
 					if ($email){
-						$email = db_escape_string( $email);
-						db_query( "UPDATE ttrss_users SET email = '$email' WHERE id = " .
+						$email = db_escape_string($email);
+						db_query("UPDATE ttrss_users SET email = '$email' WHERE id = " .
 							$user_id);
 					}
 				}
diff --git a/plugins/close_button/init.php b/plugins/close_button/init.php
index 6fdd96f55..78f2edd2a 100644
--- a/plugins/close_button/init.php
+++ b/plugins/close_button/init.php
@@ -15,7 +15,7 @@ class Close_Button extends Plugin {
 	}
 
 	function hook_article_button($line) {
-		if (!get_pref( "COMBINED_DISPLAY_MODE")) {
+		if (!get_pref("COMBINED_DISPLAY_MODE")) {
 			$rv = "<img src=\"plugins/close_button/button.png\"
 				class='tagsPic' style=\"cursor : pointer\"
 				onclick=\"closeArticlePanel()\"
diff --git a/plugins/digest/init.php b/plugins/digest/init.php
index 5b84fec16..b06097171 100644
--- a/plugins/digest/init.php
+++ b/plugins/digest/init.php
@@ -41,13 +41,13 @@ class Digest extends Plugin implements IHandler {
 	}
 
 	function digestgetcontents() {
-		$article_id = db_escape_string( $_REQUEST['article_id']);
+		$article_id = db_escape_string($_REQUEST['article_id']);
 
-		$result = db_query( "SELECT content,title,link,marked,published
+		$result = db_query("SELECT content,title,link,marked,published
 			FROM ttrss_entries, ttrss_user_entries
 			WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']);
 
-		$content = sanitize( db_fetch_result($result, 0, "content"));
+		$content = sanitize(db_fetch_result($result, 0, "content"));
 		$title = strip_tags(db_fetch_result($result, 0, "title"));
 		$article_url = htmlspecialchars(db_fetch_result($result, 0, "link"));
 		$marked = sql_bool_to_bool(db_fetch_result($result, 0, "marked"));
@@ -55,15 +55,15 @@ class Digest extends Plugin implements IHandler {
 
 		print json_encode(array("article" =>
 			array("id" => $article_id, "url" => $article_url,
-				"tags" => get_article_tags( $article_id),
+				"tags" => get_article_tags($article_id),
 				"marked" => $marked, "published" => $published,
 				"title" => $title, "content" => $content)));
 	}
 
 	function digestupdate() {
-		$feed_id = db_escape_string( $_REQUEST['feed_id']);
-		$offset = db_escape_string( $_REQUEST['offset']);
-		$seq = db_escape_string( $_REQUEST['seq']);
+		$feed_id = db_escape_string($_REQUEST['feed_id']);
+		$offset = db_escape_string($_REQUEST['offset']);
+		$seq = db_escape_string($_REQUEST['seq']);
 
 		if (!$feed_id) $feed_id = -4;
 		if (!$offset) $offset = 0;
@@ -72,18 +72,18 @@ class Digest extends Plugin implements IHandler {
 
 		$reply['seq'] = $seq;
 
-		$headlines = API::api_get_headlines( $feed_id, 30, $offset,
+		$headlines = API::api_get_headlines($feed_id, 30, $offset,
 				'', ($feed_id == -4), true, false, "unread", "updated DESC", 0, 0);
 
 		$reply['headlines'] = array();
-		$reply['headlines']['title'] = getFeedTitle( $feed_id);
+		$reply['headlines']['title'] = getFeedTitle($feed_id);
 		$reply['headlines']['content'] = $headlines;
 
 		print json_encode($reply);
 	}
 
 	function digestinit() {
-		$tmp_feeds = API::api_get_feeds( -4, true, false, 0);
+		$tmp_feeds = API::api_get_feeds(-4, true, false, 0);
 
 		$params = array();
 		$feeds = array();
diff --git a/plugins/embed_original/init.php b/plugins/embed_original/init.php
index f91acda7c..c65793e16 100644
--- a/plugins/embed_original/init.php
+++ b/plugins/embed_original/init.php
@@ -34,9 +34,9 @@ class Embed_Original extends Plugin {
 	}
 
 	function getUrl() {
-		$id = db_escape_string( $_REQUEST['id']);
+		$id = db_escape_string($_REQUEST['id']);
 
-		$result = db_query( "SELECT link
+		$result = db_query("SELECT link
 				FROM ttrss_entries, ttrss_user_entries
 				WHERE id = '$id' AND ref_id = id AND owner_uid = " .$_SESSION['uid']);
 
diff --git a/plugins/example/init.php b/plugins/example/init.php
index 8deee84b4..8f4e8abf4 100644
--- a/plugins/example/init.php
+++ b/plugins/example/init.php
@@ -19,7 +19,7 @@ class Example extends Plugin {
 	}
 
 	function save() {
-		$example_value = db_escape_string( $_POST["example_value"]);
+		$example_value = db_escape_string($_POST["example_value"]);
 
 		$this->host->set($this, "example", $example_value);
 
diff --git a/plugins/example_vfeed/init.php b/plugins/example_vfeed/init.php
index e7efa757b..b137fd0f9 100644
--- a/plugins/example_vfeed/init.php
+++ b/plugins/example_vfeed/init.php
@@ -27,7 +27,7 @@ class Example_VFeed extends Plugin {
 	}
 
 	function get_headlines($feed_id, $options) {
-		$qfh_ret = queryFeedHeadlines( -4,
+		$qfh_ret = queryFeedHeadlines(-4,
 			$options['limit'],
 			$options['view_mode'], $options['cat_view'],
 			$options['search'],
diff --git a/plugins/googlereaderimport/init.php b/plugins/googlereaderimport/init.php
index 8986f469c..183875ec8 100644
--- a/plugins/googlereaderimport/init.php
+++ b/plugins/googlereaderimport/init.php
@@ -30,11 +30,11 @@ class GoogleReaderImport extends Plugin {
 
 		_debug("please enter your username:");
 
-		$username = db_escape_string( trim(read_stdin()));
+		$username = db_escape_string(trim(read_stdin()));
 
 		_debug("looking up user: $username...");
 
-		$result = db_query( "SELECT id FROM ttrss_users
+		$result = db_query("SELECT id FROM ttrss_users
 			WHERE login = '$username'");
 
 		if (db_num_rows($result) == 0) {
@@ -111,19 +111,19 @@ class GoogleReaderImport extends Plugin {
 				foreach ($doc['items'] as $item) {
 //					print_r($item);
 
-					$guid = db_escape_string( mb_substr($item['id'], 0, 250));
-					$title = db_escape_string( $item['title']);
+					$guid = db_escape_string(mb_substr($item['id'], 0, 250));
+					$title = db_escape_string($item['title']);
 					$updated = date('Y-m-d h:i:s', $item['updated']);
 					$link = '';
 					$content = '';
-					$author = db_escape_string( $item['author']);
+					$author = db_escape_string($item['author']);
 					$tags = array();
 					$orig_feed_data = array();
 
 					if (is_array($item['alternate'])) {
 						foreach ($item['alternate'] as $alt) {
 							if (isset($alt['type']) && $alt['type'] == 'text/html') {
-								$link = db_escape_string( $alt['href']);
+								$link = db_escape_string($alt['href']);
 							}
 						}
 					}
@@ -206,9 +206,9 @@ class GoogleReaderImport extends Plugin {
 
 		$content_hash = sha1($content);
 
-		if (filter_var( FILTER_VALIDATE_URL) === FALSE) return false;
+		if (filter_var(FILTER_VALIDATE_URL) === FALSE) return false;
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
 		$feed_id = 'NULL';
 
@@ -254,18 +254,18 @@ class GoogleReaderImport extends Plugin {
 			// locate archived entry to file entries in, we don't want to file them in actual feeds because of purging
 			// maybe file marked in real feeds because eh
 
-			$result = db_query( "SELECT id FROM ttrss_archived_feeds WHERE
+			$result = db_query("SELECT id FROM ttrss_archived_feeds WHERE
 				feed_url = '".$orig_feed_data['feed_url']."' AND owner_uid = $owner_uid");
 
 			if (db_num_rows($result) != 0) {
 				$orig_feed_id = db_fetch_result($result, 0, "id");
 			} else {
-				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'");
 
-				$result = db_query( "SELECT id FROM ttrss_archived_feeds WHERE
+				$result = db_query("SELECT id FROM ttrss_archived_feeds WHERE
 					feed_url = '".$orig_feed_data['feed_url']."' AND owner_uid = $owner_uid");
 
 				if (db_num_rows($result) != 0) {
@@ -276,32 +276,32 @@ class GoogleReaderImport extends Plugin {
 
 		// delete temporarily inserted feed
 		if ($feed_id && $feed_inserted) {
-				db_query( "DELETE FROM ttrss_feeds WHERE id = $feed_id");
+				db_query("DELETE FROM ttrss_feeds WHERE id = $feed_id");
 		}
 
 		if (!$orig_feed_id) $orig_feed_id = 'NULL';
 
-		$result = db_query( "SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
+		$result = db_query("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
 			guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
 
 		if (db_num_rows($result) == 0) {
-			$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, author)
 				VALUES
 				('$title', '$guid', '$link', '$updated', '$content', '$content_hash', NOW(), NOW(), '$author')");
 
-			$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, marked, tag_cache, label_cache,
 						last_read, note, unread, last_marked)
 					VALUES
 					('$ref_id', '', NULL, $orig_feed_id, $owner_uid, $marked, '', '', NOW(), '', false, NOW())");
 
-				$result = db_query( "SELECT int_id FROM ttrss_user_entries, ttrss_entries
+				$result = db_query("SELECT int_id FROM ttrss_user_entries, ttrss_entries
 					WHERE owner_uid = $owner_uid AND ref_id = id AND ref_id = $ref_id");
 
 				if (db_num_rows($result) != 0 && is_array($tags)) {
@@ -311,16 +311,16 @@ class GoogleReaderImport extends Plugin {
 
 					foreach ($tags as $tag) {
 
-						$tag = db_escape_string( sanitize_tag($tag));
+						$tag = db_escape_string(sanitize_tag($tag));
 
 						if (!tag_is_valid($tag)) continue;
 
-						$result = db_query( "SELECT id FROM ttrss_tags
+						$result = db_query("SELECT id FROM ttrss_tags
 							WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND
 							owner_uid = '$owner_uid' LIMIT 1");
 
 							if ($result && db_num_rows($result) == 0) {
-								db_query( "INSERT INTO ttrss_tags
+								db_query("INSERT INTO ttrss_tags
 									(owner_uid,tag_name,post_int_id)
 									VALUES ('$owner_uid','$tag', '$entry_int_id')");
 							}
@@ -331,9 +331,9 @@ class GoogleReaderImport extends Plugin {
 					/* update the cache */
 
 					$tags_to_cache = array_unique($tags_to_cache);
-					$tags_str = db_escape_string( join(",", $tags_to_cache));
+					$tags_str = db_escape_string(join(",", $tags_to_cache));
 
-					db_query( "UPDATE ttrss_user_entries
+					db_query("UPDATE ttrss_user_entries
 						SET tag_cache = '$tags_str' WHERE ref_id = '$ref_id'
 						AND owner_uid = $owner_uid");
 				}
@@ -342,7 +342,7 @@ class GoogleReaderImport extends Plugin {
 			}
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 
 		return $rc;
 	}
diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php
index 981a2b581..e4e98c036 100644
--- a/plugins/import_export/init.php
+++ b/plugins/import_export/init.php
@@ -26,11 +26,11 @@ class Import_Export extends Plugin implements IHandler {
 
 		_debug("please enter your username:");
 
-		$username = db_escape_string( trim(read_stdin()));
+		$username = db_escape_string(trim(read_stdin()));
 
 		_debug("importing $filename for user $username...\n");
 
-		$result = db_query( "SELECT id FROM ttrss_users WHERE login = '$username'");
+		$result = db_query("SELECT id FROM ttrss_users WHERE login = '$username'");
 
 		if (db_num_rows($result) == 0) {
 			print "error: could not find user $username.\n";
@@ -39,11 +39,11 @@ class Import_Export extends Plugin implements IHandler {
 
 		$owner_uid = db_fetch_result($result, 0, "id");
 
-		$this->perform_data_import( $filename, $owner_uid);
+		$this->perform_data_import($filename, $owner_uid);
 	}
 
 	function save() {
-		$example_value = db_escape_string( $_POST["example_value"]);
+		$example_value = db_escape_string($_POST["example_value"]);
 
 		echo "Value set to $example_value (not really)";
 	}
@@ -117,12 +117,12 @@ class Import_Export extends Plugin implements IHandler {
 	}
 
 	function exportrun() {
-		$offset = (int) db_escape_string( $_REQUEST['offset']);
+		$offset = (int) db_escape_string($_REQUEST['offset']);
 		$exported = 0;
 		$limit = 250;
 
 		if ($offset < 10000 && is_writable(CACHE_DIR . "/export")) {
-			$result = db_query( "SELECT
+			$result = db_query("SELECT
 					ttrss_entries.guid,
 					ttrss_entries.title,
 					content,
@@ -181,7 +181,7 @@ class Import_Export extends Plugin implements IHandler {
 		print json_encode(array("exported" => $exported));
 	}
 
-	function perform_data_import( $filename, $owner_uid) {
+	function perform_data_import($filename, $owner_uid) {
 
 		$num_imported = 0;
 		$num_processed = 0;
@@ -234,7 +234,7 @@ class Import_Export extends Plugin implements IHandler {
 
 					foreach ($article_node->childNodes as $child) {
 						if ($child->nodeName != 'label_cache')
-							$article[$child->nodeName] = db_escape_string( $child->nodeValue);
+							$article[$child->nodeName] = db_escape_string($child->nodeValue);
 						else
 							$article[$child->nodeName] = $child->nodeValue;
 					}
@@ -245,11 +245,11 @@ class Import_Export extends Plugin implements IHandler {
 
 						++$num_processed;
 
-						//db_query( "BEGIN");
+						//db_query("BEGIN");
 
 						//print 'GUID:' . $article['guid'] . "\n";
 
-						$result = db_query( "SELECT id FROM ttrss_entries
+						$result = db_query("SELECT id FROM ttrss_entries
 							WHERE guid = '".$article['guid']."'");
 
 						if (db_num_rows($result) == 0) {
@@ -282,7 +282,7 @@ class Import_Export extends Plugin implements IHandler {
 									'0',
 									'')");
 
-							$result = db_query( "SELECT id FROM ttrss_entries
+							$result = db_query("SELECT id FROM ttrss_entries
 								WHERE guid = '".$article['guid']."'");
 
 							if (db_num_rows($result) != 0) {
@@ -303,7 +303,7 @@ class Import_Export extends Plugin implements IHandler {
 							$feed = 'NULL';
 
 							if ($feed_url && $feed_title) {
-								$result = db_query( "SELECT id FROM ttrss_feeds
+								$result = db_query("SELECT id FROM ttrss_feeds
 									WHERE feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
 
 								if (db_num_rows($result) != 0) {
@@ -311,10 +311,10 @@ class Import_Export extends Plugin implements IHandler {
 								} else {
 									// try autocreating feed in Uncategorized...
 
-									$result = db_query( "INSERT INTO ttrss_feeds (owner_uid,
+									$result = db_query("INSERT INTO ttrss_feeds (owner_uid,
 										feed_url, title) VALUES ($owner_uid, '$feed_url', '$feed_title')");
 
-									$result = db_query( "SELECT id FROM ttrss_feeds
+									$result = db_query("SELECT id FROM ttrss_feeds
 										WHERE feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
 
 									if (db_num_rows($result) != 0) {
@@ -332,7 +332,7 @@ class Import_Export extends Plugin implements IHandler {
 
 							//print "$ref_id / $feed / " . $article['title'] . "\n";
 
-							$result = db_query( "SELECT int_id FROM ttrss_user_entries
+							$result = db_query("SELECT int_id FROM ttrss_user_entries
 								WHERE ref_id = '$ref_id' AND owner_uid = '$owner_uid' AND $feed_qpart");
 
 							if (db_num_rows($result) == 0) {
@@ -342,7 +342,7 @@ class Import_Export extends Plugin implements IHandler {
 								$score = (int) $article['score'];
 
 								$tag_cache = $article['tag_cache'];
-								$label_cache = db_escape_string( $article['label_cache']);
+								$label_cache = db_escape_string($article['label_cache']);
 								$note = $article['note'];
 
 								//print "Importing " . $article['title'] . "<br/>";
@@ -362,15 +362,15 @@ class Import_Export extends Plugin implements IHandler {
 								if (is_array($label_cache) && $label_cache["no-labels"] != 1) {
 									foreach ($label_cache as $label) {
 
-										label_create( $label[1],
+										label_create($label[1],
 											$label[2], $label[3], $owner_uid);
 
-										label_add_article( $ref_id, $label[1], $owner_uid);
+										label_add_article($ref_id, $label[1], $owner_uid);
 
 									}
 								}
 
-								//db_query( "COMMIT");
+								//db_query("COMMIT");
 							}
 						}
 					}
@@ -438,7 +438,7 @@ class Import_Export extends Plugin implements IHandler {
 		}
 
 		if (is_file($tmp_file)) {
-			$this->perform_data_import( $tmp_file, $_SESSION['uid']);
+			$this->perform_data_import($tmp_file, $_SESSION['uid']);
 			unlink($tmp_file);
 		} else {
 			print_error(__('No file uploaded.'));
diff --git a/plugins/instances/init.php b/plugins/instances/init.php
index 12ae07280..a87684b56 100644
--- a/plugins/instances/init.php
+++ b/plugins/instances/init.php
@@ -37,7 +37,7 @@ class Instances extends Plugin implements IHandler {
 	// 2   - did not receive valid data
 	// >10 - server error, code + 10 (e.g. 16 means server error 6)
 
-	function get_linked_feeds( $instance_id = false) {
+	function get_linked_feeds($instance_id = false) {
 		if ($instance_id)
 			$instance_qpart = "id = '$instance_id' AND ";
 		else
@@ -49,7 +49,7 @@ class Instances extends Plugin implements IHandler {
 			$date_qpart = "last_connected < DATE_SUB(NOW(), INTERVAL 6 HOUR)";
 		}
 
-		$result = db_query( "SELECT id, access_key, access_url FROM ttrss_linked_instances
+		$result = db_query("SELECT id, access_key, access_url FROM ttrss_linked_instances
 			WHERE $instance_qpart $date_qpart ORDER BY last_connected");
 
 		while ($line = db_fetch_assoc($result)) {
@@ -77,7 +77,7 @@ class Instances extends Plugin implements IHandler {
 
 						// access denied
 						if ($status == 16) {
-							db_query( "DELETE FROM ttrss_linked_feeds
+							db_query("DELETE FROM ttrss_linked_feeds
 								WHERE instance_id = '$id'");
 						}
 					} else {
@@ -85,16 +85,16 @@ class Instances extends Plugin implements IHandler {
 
 						if (count($feeds['feeds']) > 0) {
 
-							db_query( "DELETE FROM ttrss_linked_feeds
+							db_query("DELETE FROM ttrss_linked_feeds
 								WHERE instance_id = '$id'");
 
 							foreach ($feeds['feeds'] as $feed) {
-								$feed_url = db_escape_string( $feed['feed_url']);
-								$title = db_escape_string( $feed['title']);
-								$subscribers = db_escape_string( $feed['subscribers']);
-								$site_url = db_escape_string( $feed['site_url']);
+								$feed_url = db_escape_string($feed['feed_url']);
+								$title = db_escape_string($feed['title']);
+								$subscribers = db_escape_string($feed['subscribers']);
+								$site_url = db_escape_string($feed['site_url']);
 
-								db_query( "INSERT INTO ttrss_linked_feeds
+								db_query("INSERT INTO ttrss_linked_feeds
 									(feed_url, site_url, title, subscribers, instance_id, created, updated)
 								VALUES
 									('$feed_url', '$site_url', '$title', '$subscribers', '$id', NOW(), NOW())");
@@ -119,7 +119,7 @@ class Instances extends Plugin implements IHandler {
 
 			_debug("Status: $status");
 
-			db_query( "UPDATE ttrss_linked_instances SET
+			db_query("UPDATE ttrss_linked_instances SET
 				last_status_out = '$status', last_connected = NOW() WHERE id = '$id'");
 
 		}
@@ -127,7 +127,7 @@ class Instances extends Plugin implements IHandler {
 
 
 	function get_feeds() {
-		$this->get_linked_feeds( false);
+		$this->get_linked_feeds(false);
 	}
 
 	function get_prefs_js() {
@@ -164,37 +164,37 @@ class Instances extends Plugin implements IHandler {
 	}
 
 	function remove() {
-		$ids = db_escape_string( $_REQUEST['ids']);
+		$ids = db_escape_string($_REQUEST['ids']);
 
-		db_query( "DELETE FROM ttrss_linked_instances WHERE
+		db_query("DELETE FROM ttrss_linked_instances WHERE
 			id IN ($ids)");
 	}
 
 	function add() {
-		$id = db_escape_string( $_REQUEST["id"]);
-		$access_url = db_escape_string( $_REQUEST["access_url"]);
-		$access_key = db_escape_string( $_REQUEST["access_key"]);
+		$id = db_escape_string($_REQUEST["id"]);
+		$access_url = db_escape_string($_REQUEST["access_url"]);
+		$access_key = db_escape_string($_REQUEST["access_key"]);
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
-		$result = db_query( "SELECT id FROM ttrss_linked_instances
+		$result = db_query("SELECT id FROM ttrss_linked_instances
 			WHERE access_url = '$access_url'");
 
 		if (db_num_rows($result) == 0) {
-			db_query( "INSERT INTO ttrss_linked_instances
+			db_query("INSERT INTO ttrss_linked_instances
 				(access_url, access_key, last_connected, last_status_in, last_status_out)
 				VALUES
 				('$access_url', '$access_key', '1970-01-01', -1, -1)");
 
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 	}
 
 	function edit() {
-		$id = db_escape_string( $_REQUEST["id"]);
+		$id = db_escape_string($_REQUEST["id"]);
 
-		$result = db_query( "SELECT * FROM ttrss_linked_instances WHERE
+		$result = db_query("SELECT * FROM ttrss_linked_instances WHERE
 			id = '$id'");
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"id\" value=\"$id\">";
@@ -250,11 +250,11 @@ class Instances extends Plugin implements IHandler {
 	}
 
 	function editSave() {
-		$id = db_escape_string( $_REQUEST["id"]);
-		$access_url = db_escape_string( $_REQUEST["access_url"]);
-		$access_key = db_escape_string( $_REQUEST["access_key"]);
+		$id = db_escape_string($_REQUEST["id"]);
+		$access_url = db_escape_string($_REQUEST["access_url"]);
+		$access_key = db_escape_string($_REQUEST["access_key"]);
 
-		db_query( "UPDATE ttrss_linked_instances SET
+		db_query("UPDATE ttrss_linked_instances SET
 			access_key = '$access_key', access_url = '$access_url',
 			last_connected = '1970-01-01'
 			WHERE id = '$id'");
@@ -274,7 +274,7 @@ class Instances extends Plugin implements IHandler {
 
 		print "<div id=\"pref-instance-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-		$sort = db_escape_string( $_REQUEST["sort"]);
+		$sort = db_escape_string($_REQUEST["sort"]);
 
 		if (!$sort || $sort == "undefined") {
 			$sort = "access_url";
@@ -295,7 +295,7 @@ class Instances extends Plugin implements IHandler {
 
 		print "</div>"; #toolbar
 
-		$result = db_query( "SELECT *,
+		$result = db_query("SELECT *,
 			(SELECT COUNT(*) FROM ttrss_linked_feeds
 				WHERE instance_id = ttrss_linked_instances.id) AS num_feeds
 			FROM ttrss_linked_instances
@@ -324,7 +324,7 @@ class Instances extends Plugin implements IHandler {
 			$id = $line['id'];
 			$this_row_id = "id=\"LIRR-$id\"";
 
-			$line["last_connected"] = make_local_datetime( $line["last_connected"], false);
+			$line["last_connected"] = make_local_datetime($line["last_connected"], false);
 
 			print "<tr class=\"$class\" $this_row_id>";
 
@@ -361,17 +361,17 @@ class Instances extends Plugin implements IHandler {
 
 	function fbexport() {
 
-		$access_key = db_escape_string( $_POST["key"]);
+		$access_key = db_escape_string($_POST["key"]);
 
 		// TODO: rate limit checking using last_connected
-		$result = db_query( "SELECT id FROM ttrss_linked_instances
+		$result = db_query("SELECT id FROM ttrss_linked_instances
 			WHERE access_key = '$access_key'");
 
 		if (db_num_rows($result) == 1) {
 
 			$instance_id = db_fetch_result($result, 0, "id");
 
-			$result = db_query( "SELECT feed_url, site_url, title, subscribers
+			$result = db_query("SELECT feed_url, site_url, title, subscribers
 				FROM ttrss_feedbrowser_cache ORDER BY subscribers DESC LIMIT 100");
 
 			$feeds = array();
@@ -380,7 +380,7 @@ class Instances extends Plugin implements IHandler {
 				array_push($feeds, $line);
 			}
 
-			db_query( "UPDATE ttrss_linked_instances SET
+			db_query("UPDATE ttrss_linked_instances SET
 				last_status_in = 1 WHERE id = '$instance_id'");
 
 			print json_encode(array("feeds" => $feeds));
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 7adf36fe4..2897068aa 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -28,13 +28,13 @@ class Mail extends Plugin {
 
 	function emailArticle() {
 
-		$param = db_escape_string( $_REQUEST['param']);
+		$param = db_escape_string($_REQUEST['param']);
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"mail\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"sendEmail\">";
 
-		$result = db_query( "SELECT email, full_name FROM ttrss_users WHERE
+		$result = db_query("SELECT email, full_name FROM ttrss_users WHERE
 			id = " . $_SESSION["uid"]);
 
 		$user_email = htmlspecialchars(db_fetch_result($result, 0, "email"));
@@ -56,7 +56,7 @@ class Mail extends Plugin {
 		$tpl->setVariable('USER_EMAIL', $user_email, true);
 		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
-		$result = db_query( "SELECT link, content, title
+		$result = db_query("SELECT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
 
@@ -147,7 +147,7 @@ class Mail extends Plugin {
 		if (!$rc) {
 			$reply['error'] =  $mail->ErrorInfo;
 		} else {
-			save_email_address( db_escape_string($destination));
+			save_email_address(db_escape_string($destination));
 			$reply['message'] = "UPDATE_COUNTERS";
 		}
 
@@ -155,7 +155,7 @@ class Mail extends Plugin {
 	}
 
 	function completeEmails() {
-		$search = db_escape_string( $_REQUEST["search"]);
+		$search = db_escape_string($_REQUEST["search"]);
 
 		print "<ul>";
 
diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 81b2758b8..c786cf0dc 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -27,7 +27,7 @@ class MailTo extends Plugin {
 
 	function emailArticle() {
 
-		$param = db_escape_string( $_REQUEST['param']);
+		$param = db_escape_string($_REQUEST['param']);
 
 		require_once "lib/MiniTemplator.class.php";
 
@@ -41,7 +41,7 @@ class MailTo extends Plugin {
 		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
 
-		$result = db_query( "SELECT link, content, title
+		$result = db_query("SELECT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
 
diff --git a/plugins/mark_button/init.php b/plugins/mark_button/init.php
index 1ed2ea438..b6a311bc3 100644
--- a/plugins/mark_button/init.php
+++ b/plugins/mark_button/init.php
@@ -18,7 +18,7 @@ class Mark_Button extends Plugin {
 		$marked_pic = "";
 		$id = $line["id"];
 
-		if (get_pref( "COMBINED_DISPLAY_MODE")) {
+		if (get_pref("COMBINED_DISPLAY_MODE")) {
 			if (sql_bool_to_bool($line["marked"])) {
 				$marked_pic = "<img
 					src=\"images/mark_set.svg\"
diff --git a/plugins/mobile/article.php b/plugins/mobile/article.php
index 17fc39395..f51c8962c 100644
--- a/plugins/mobile/article.php
+++ b/plugins/mobile/article.php
@@ -20,13 +20,13 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 
-	$id = db_escape_string( $_REQUEST["id"]);
-	$feed_id = db_escape_string( $_REQUEST["feed"]);
-	$cat_id = db_escape_string( $_REQUEST["cat"]);
-	$is_cat = db_escape_string( $_REQUEST["is_cat"]);
+	$id = db_escape_string($_REQUEST["id"]);
+	$feed_id = db_escape_string($_REQUEST["feed"]);
+	$cat_id = db_escape_string($_REQUEST["cat"]);
+	$is_cat = db_escape_string($_REQUEST["is_cat"]);
 
-  	render_article( $id, $feed_id, $cat_id, $is_cat);
+  	render_article($id, $feed_id, $cat_id, $is_cat);
 ?>
 
diff --git a/plugins/mobile/backend.php b/plugins/mobile/backend.php
index a62f462d5..872798814 100644
--- a/plugins/mobile/backend.php
+++ b/plugins/mobile/backend.php
@@ -31,28 +31,28 @@
 
 	switch ($op) {
 	case "toggleMarked":
-		$cmode = db_escape_string( $_REQUEST["mark"]);
-		$id = db_escape_string( $_REQUEST["id"]);
+		$cmode = db_escape_string($_REQUEST["mark"]);
+		$id = db_escape_string($_REQUEST["id"]);
 
-		markArticlesById( array($id), $cmode);
+		markArticlesById(array($id), $cmode);
 		break;
 	case "togglePublished":
-		$cmode = db_escape_string( $_REQUEST["pub"]);
-		$id = db_escape_string( $_REQUEST["id"]);
+		$cmode = db_escape_string($_REQUEST["pub"]);
+		$id = db_escape_string($_REQUEST["id"]);
 
-		publishArticlesById( array($id), $cmode);
+		publishArticlesById(array($id), $cmode);
 		break;
 	case "toggleUnread":
-		$cmode = db_escape_string( $_REQUEST["unread"]);
-		$id = db_escape_string( $_REQUEST["id"]);
+		$cmode = db_escape_string($_REQUEST["unread"]);
+		$id = db_escape_string($_REQUEST["id"]);
 
-		catchupArticlesById( array($id), $cmode);
+		catchupArticlesById(array($id), $cmode);
 		break;
 
 	case "setPref":
-		$id = db_escape_string( $_REQUEST["id"]);
-		$value = db_escape_string( $_REQUEST["to"]);
-		mobile_set_pref( $id, $value);
+		$id = db_escape_string($_REQUEST["id"]);
+		$value = db_escape_string($_REQUEST["to"]);
+		mobile_set_pref($id, $value);
 		print_r($_SESSION);
 		break;
 	default:
diff --git a/plugins/mobile/cat.php b/plugins/mobile/cat.php
index ec5bbf3d9..5164d0049 100644
--- a/plugins/mobile/cat.php
+++ b/plugins/mobile/cat.php
@@ -20,10 +20,10 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 
-	$cat_id = db_escape_string( $_REQUEST["id"]);
+	$cat_id = db_escape_string($_REQUEST["id"]);
 
-  	render_category( $cat_id);
+  	render_category($cat_id);
 ?>
 
diff --git a/plugins/mobile/feed.php b/plugins/mobile/feed.php
index 08e916e21..e09f9432a 100644
--- a/plugins/mobile/feed.php
+++ b/plugins/mobile/feed.php
@@ -20,14 +20,14 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 
-	$feed_id = db_escape_string( $_REQUEST["id"]);
-	$cat_id = db_escape_string( $_REQUEST["cat"]);
-	$offset = (int) db_escape_string( $_REQUEST["skip"]);
-	$search = db_escape_string( $_REQUEST["search"]);
-	$is_cat = (bool) db_escape_string( $_REQUEST["is_cat"]);
+	$feed_id = db_escape_string($_REQUEST["id"]);
+	$cat_id = db_escape_string($_REQUEST["cat"]);
+	$offset = (int) db_escape_string($_REQUEST["skip"]);
+	$search = db_escape_string($_REQUEST["search"]);
+	$is_cat = (bool) db_escape_string($_REQUEST["is_cat"]);
 
-  	render_headlines_list( $feed_id, $cat_id, $offset, $search, $is_cat);
+  	render_headlines_list($feed_id, $cat_id, $offset, $search, $is_cat);
 ?>
 
diff --git a/plugins/mobile/home.php b/plugins/mobile/home.php
index 57b18cd85..71ef81def 100644
--- a/plugins/mobile/home.php
+++ b/plugins/mobile/home.php
@@ -20,14 +20,14 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 
-	$use_cats = mobile_get_pref( 'ENABLE_CATS');
-	$offset = (int) db_escape_string( $_REQUEST["skip"]);
+	$use_cats = mobile_get_pref('ENABLE_CATS');
+	$offset = (int) db_escape_string($_REQUEST["skip"]);
 
 	if ($use_cats) {
 		render_categories_list($link);
 	} else {
-		render_flat_feed_list( $offset);
+		render_flat_feed_list($offset);
 	}
 ?>
diff --git a/plugins/mobile/index.php b/plugins/mobile/index.php
index 8202f4043..7154ebdc2 100644
--- a/plugins/mobile/index.php
+++ b/plugins/mobile/index.php
@@ -20,7 +20,7 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -76,13 +76,13 @@
     </div>
 
 	<?php
-	$use_cats = mobile_get_pref( 'ENABLE_CATS');
-	$offset = (int) db_escape_string( $_REQUEST["skip"]);
+	$use_cats = mobile_get_pref('ENABLE_CATS');
+	$offset = (int) db_escape_string($_REQUEST["skip"]);
 
 	if ($use_cats) {
 		render_categories_list($link);
 	} else {
-		render_flat_feed_list( $offset);
+		render_flat_feed_list($offset);
 	}
 	?>
 
diff --git a/plugins/mobile/mobile-functions.php b/plugins/mobile/mobile-functions.php
index 0395ee7a5..dd5914516 100644
--- a/plugins/mobile/mobile-functions.php
+++ b/plugins/mobile/mobile-functions.php
@@ -8,34 +8,34 @@
 
 	/* TODO replace with interface to db-prefs */
 
-	function mobile_pref_toggled( $id) {
-		if (get_pref( "_MOBILE_$id"))
+	function mobile_pref_toggled($id) {
+		if (get_pref("_MOBILE_$id"))
 			return "true";
 		else
 			return "";
 	}
 
-	function mobile_get_pref( $id) {
+	function mobile_get_pref($id) {
 		//return $_SESSION["mobile-prefs"][$id];
-		return get_pref( "_MOBILE_$id");
+		return get_pref("_MOBILE_$id");
 	}
 
-	function mobile_set_pref( $id, $value) {
+	function mobile_set_pref($id, $value) {
 		//$_SESSION["mobile-prefs"][$id] = $value;
-		return set_pref( "_MOBILE_$id", $value);
+		return set_pref("_MOBILE_$id", $value);
 	}
 
 	function mobile_feed_has_icon($id) {
 		return file_exists("../../".ICONS_DIR."/$id.ico");
 	}
 
-	function render_flat_feed_list( $offset) {
+	function render_flat_feed_list($offset) {
 		$owner_uid = $_SESSION["uid"];
 		$limit = 0;
 
 		if (!$offset) $offset = 0;
 
-		if (mobile_get_pref( "SORT_FEEDS_UNREAD")) {
+		if (mobile_get_pref("SORT_FEEDS_UNREAD")) {
 			$order_by = "unread DESC, title";
 		} else {
 			$order_by = "title";
@@ -47,7 +47,7 @@
 			$limit_qpart = "";
 		}
 
-		$result = db_query( "SELECT id,
+		$result = db_query("SELECT id,
 				title,
 			(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
 				WHERE feed_id = ttrss_feeds.id AND unread = true
@@ -85,7 +85,7 @@
 					$icon_url = "../../images/blank_icon.gif";
 				}
 
-				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 					print "<li class='$class'><a href='feed.php?id=$id'>" .
 						"<img class='tinyIcon' src='$icon_url'/>".
 						$line["title"] . "</a></li>";
@@ -103,7 +103,7 @@
 
 	}
 
-	function render_category( $cat_id, $offset) {
+	function render_category($cat_id, $offset) {
 		$owner_uid = $_SESSION["uid"];
 
 		if ($cat_id >= 0) {
@@ -114,13 +114,13 @@
 				$cat_query = "cat_id IS NULL";
 			}
 
-			if (mobile_get_pref( "SORT_FEEDS_UNREAD")) {
+			if (mobile_get_pref("SORT_FEEDS_UNREAD")) {
 				$order_by = "unread DESC, title";
 			} else {
 				$order_by = "title";
 			}
 
-			$result = db_query( "SELECT id,
+			$result = db_query("SELECT id,
 				title,
 			(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
 				WHERE feed_id = ttrss_feeds.id AND unread = true
@@ -132,7 +132,7 @@
 				$cat_query
 			ORDER BY $order_by");
 
-			$title = getCategoryTitle( $cat_id);
+			$title = getCategoryTitle($cat_id);
 
 			print "<ul id='cat-$cat_id' title='$title' myBackLabel='".__("Home")."'
 				myBackHref='home.php'>";
@@ -158,7 +158,7 @@
 					$icon_url = "../../images/blank_icon.gif";
 				}
 
-				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 					print "<li class='$class'><a href='feed.php?id=$id&cat=$cat_id'>" .
 						"<img class='tinyIcon' src='$icon_url'/>".
 						$line["title"] . "</a></li>";
@@ -174,8 +174,8 @@
 				myBackHref='home.php'>";
 
 			foreach (array(-4, -3, -1, -2, 0) as $id) {
-				$title = getFeedTitle( $id);
-				$unread = getFeedUnread( $id, false);
+				$title = getFeedTitle($id);
+				$unread = getFeedUnread($id, false);
 				$icon = getFeedIcon($id);
 
 				if ($unread > 0) {
@@ -185,7 +185,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 					print "<li class='$class'>
 						<a href='feed.php?id=$id&cat=-1'>
 						<img class='tinyIcon' src='../$icon'/>$title</a></li>";
@@ -200,7 +200,7 @@
 			print "<ul id='cat--2' title='$title' myBackLabel='".__("Home")."'
 				myBackHref='home.php'>";
 
-			$result = db_query( "SELECT id, caption FROM ttrss_labels2
+			$result = db_query("SELECT id, caption FROM ttrss_labels2
 				WHERE owner_uid = '$owner_uid'");
 
 			$label_data = array();
@@ -209,7 +209,7 @@
 
 				$id = label_to_feed_id($line["id"]);
 
-				$unread = getFeedUnread( $id);
+				$unread = getFeedUnread($id);
 				$title = $line["caption"];
 
 				if ($unread > 0) {
@@ -219,7 +219,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 					print "<li class='$class'>
 						<a href='feed.php?id=$id&cat=-2'>$title</a></li>";
 				}
@@ -231,7 +231,7 @@
 	function render_categories_list($link) {
 		$owner_uid = $_SESSION["uid"];
 
-		$cat_browse = mobile_get_pref( "BROWSE_CATS");
+		$cat_browse = mobile_get_pref("BROWSE_CATS");
 
 		print '<ul id="home" title="'.__('Home').'" selected="true"
 			myBackLabel="'.__('Logout').'" myBackHref="logout.php" myBackTarget="_self">';
@@ -239,8 +239,8 @@
 //		print "<li><a href='#searchForm'>Search...</a></li>";
 
 		foreach (array(-1, -2) as $id) {
-			$title = getCategoryTitle( $id);
-			$unread = getFeedUnread( $id, true);
+			$title = getCategoryTitle($id);
+			$unread = getFeedUnread($id, true);
 			if ($unread > 0) {
 				$title = $title . " ($unread)";
 				$class = '';
@@ -254,7 +254,7 @@
 				print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>$title</a></li>";
 		}
 
-		$result = db_query( "SELECT
+		$result = db_query("SELECT
 				ttrss_feed_categories.id,
 				ttrss_feed_categories.title,
 				COUNT(ttrss_feeds.id) AS num_feeds
@@ -269,7 +269,7 @@
 
 			if ($line["num_feeds"] > 0) {
 
-				$unread = getFeedUnread( $line["id"], true);
+				$unread = getFeedUnread($line["id"], true);
 				$id = $line["id"];
 
 				if ($unread > 0) {
@@ -279,7 +279,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 
 					if ($cat_browse)
 						print "<li class='$class'><a href='cat.php?id=$id'>" .
@@ -292,13 +292,13 @@
 		}
 
 
-		$result = db_query( "SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE
+		$result = db_query("SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE
 			cat_id IS NULL and owner_uid = '$owner_uid'");
 
 		$num_feeds = db_fetch_result($result, 0, "nf");
 
 		if ($num_feeds > 0) {
-			$unread = getFeedUnread( 0, true);
+			$unread = getFeedUnread(0, true);
 			$title = "Uncategorized";
 
 			if ($unread > 0) {
@@ -308,7 +308,7 @@
 				$class = 'oldItem';
 			}
 
-			if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+			if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 				if ($cat_browse)
 					print "<li class='$class'><a href='cat.php?id=0'>$title</a></li>";
 				else
@@ -320,14 +320,14 @@
 		print "</ul>";
 	}
 
-	function render_headlines_list( $feed_id, $cat_id, $offset, $search,
+	function render_headlines_list($feed_id, $cat_id, $offset, $search,
 		$is_cat = false) {
 
 		$feed_id = $feed_id;
 		$limit = 15;
 		$filter = '';
 
-		if (!mobile_get_pref( "HIDE_READ"))
+		if (!mobile_get_pref("HIDE_READ"))
 			$view_mode = "all_articles";
 		else
 			$view_mode = 'adaptive';
@@ -338,9 +338,9 @@
 			$search_mode = '';
 		}
 
-		$qfh_ret = queryFeedHeadlines( $feed_id, $limit,
+		$qfh_ret = queryFeedHeadlines($feed_id, $limit,
 			$view_mode, $is_cat, $search, $search_mode,
-			"score DESC, date_entered ".(mobile_get_pref( 'REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset);
+			"score DESC, date_entered ".(mobile_get_pref('REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset);
 
 		$result = $qfh_ret[0];
 		$feed_title = $qfh_ret[1];
@@ -364,7 +364,7 @@
 			  </form>";
 
 			if ($cat_id) {
-				$cat_title = getCategoryTitle( $cat_id);
+				$cat_title = getCategoryTitle($cat_id);
 
 				print "<ul id=\"feed-$feed_id\" title=\"$feed_title\" selected=\"true\"
 					myBackLabel='$cat_title' myBackHref='cat.php?id=$cat_id'>";
@@ -413,7 +413,7 @@
 //		print "<a target='_replace' href='feed.php?id=$feed_id&cat=$cat_id&skip=0'>Next $limit articles...</a>";
 
 		$next_offset = $offset + $num_headlines;
-		$num_unread = getFeedUnread( $feed_id, $is_cat);
+		$num_unread = getFeedUnread($feed_id, $is_cat);
 
 		/* FIXME needs normal implementation */
 
@@ -435,7 +435,7 @@
 
 	}
 
-	function render_article( $id, $feed_id, $cat_id, $is_cat) {
+	function render_article($id, $feed_id, $cat_id, $is_cat) {
 
 		$query = "SELECT title,link,content,feed_id,comments,int_id,
 			marked,unread,published,
@@ -445,33 +445,33 @@
 			WHERE	id = '$id' AND ref_id = id AND owner_uid = " .
 				$_SESSION["uid"] ;
 
-		$result = db_query( $query);
+		$result = db_query($query);
 
 		if (db_num_rows($result) != 0) {
 
 			$line = db_fetch_assoc($result);
 
-			$tmp_result = db_query( "UPDATE ttrss_user_entries
+			$tmp_result = db_query("UPDATE ttrss_user_entries
 				SET unread = false,last_read = NOW()
 				WHERE ref_id = '$id'
 				AND owner_uid = " . $_SESSION["uid"]);
 
-			$updated_fmt = make_local_datetime( $line['updated'], false);
+			$updated_fmt = make_local_datetime($line['updated'], false);
 
 			$title = $line["title"];
 			$article_link = $line["link"];
 
 			if (!$is_cat)
-				$feed_title = getFeedTitle( $feed_id);
+				$feed_title = getFeedTitle($feed_id);
 			else
-				$feed_title = getCategoryTitle( $feed_id);
+				$feed_title = getCategoryTitle($feed_id);
 
 			print "<div class=\"panel\" id=\"article-$id\" title=\"$title\"
 				selected=\"true\"
 				myBackLabel='$feed_title' myBackHref='feed.php?id=$feed_id&cat=$cat_id&is_cat=$is_cat'>";
 
 			if ($line['feed_id'] != $feed_id) {
-				$real_feed_title = getFeedTitle( $line['feed_id']);
+				$real_feed_title = getFeedTitle($line['feed_id']);
 				$real_feed_id = $line['feed_id'];
 				$feed_link = "(<a href=\"feed.php?id=$real_feed_id\">$real_feed_title</a>)";
 			}
@@ -497,10 +497,10 @@
 
 //			print "</fieldset>";
 
-			$content = sanitize( $line["content"]);
+			$content = sanitize($line["content"]);
 			$content = preg_replace("/href=/i", "target=\"_blank\" href=", $content);
 
-			if (!mobile_get_pref( "SHOW_IMAGES")) {
+			if (!mobile_get_pref("SHOW_IMAGES")) {
 				$content = preg_replace('/<img[^>]+>/is', '', $content);
 			}
 
diff --git a/plugins/mobile/prefs.php b/plugins/mobile/prefs.php
index 78b6e8a7b..ac7762fe5 100644
--- a/plugins/mobile/prefs.php
+++ b/plugins/mobile/prefs.php
@@ -22,7 +22,7 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 ?>
 
 <div class="panel" id="prefs" selected="yes" title="Preferences"
@@ -32,33 +32,33 @@
 
 <div class="row">
 	<label><?php echo __('Enable categories') ?></label>
-	<div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Browse categories like folders') ?></label>
-	<div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 
 <div class="row">
 	<label><?php echo __('Show images in posts') ?></label>
-	<div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Hide read articles and feeds') ?></label>
-	<div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Sort feeds by unread count') ?></label>
-	<div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Reverse headline order (oldest first)') ?></label>
-	<div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 </fieldset>
diff --git a/plugins/note/init.php b/plugins/note/init.php
index a5396e5a4..f5816bc27 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -27,9 +27,9 @@ class Note extends Plugin {
 	}
 
 	function edit() {
-		$param = db_escape_string( $_REQUEST['param']);
+		$param = db_escape_string($_REQUEST['param']);
 
-		$result = db_query( "SELECT note FROM ttrss_user_entries WHERE
+		$result = db_query("SELECT note FROM ttrss_user_entries WHERE
 			ref_id = '$param' AND owner_uid = " . $_SESSION['uid']);
 
 		$note = db_fetch_result($result, 0, "note");
@@ -56,10 +56,10 @@ class Note extends Plugin {
 	}
 
 	function setNote() {
-		$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"])));
 
-		db_query( "UPDATE ttrss_user_entries SET note = '$note'
+		db_query("UPDATE ttrss_user_entries SET note = '$note'
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
 		$formatted_note = format_article_note($id, $note);
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index 92b5f65b2..c4182731d 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -88,7 +88,7 @@ class NSFW extends Plugin {
 	}
 
 	function save() {
-		$tags = explode(",", db_escape_string( $_POST["tags"]));
+		$tags = explode(",", db_escape_string($_POST["tags"]));
 		$tags = array_map("trim", $tags);
 		$tags = array_map("mb_strtolower", $tags);
 		$tags = join(", ", $tags);
diff --git a/plugins/share/init.php b/plugins/share/init.php
index b9e030d37..53b9dcdce 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -26,9 +26,9 @@ class Share extends Plugin {
 	}
 
 	function shareArticle() {
-		$param = db_escape_string( $_REQUEST['param']);
+		$param = db_escape_string($_REQUEST['param']);
 
-		$result = db_query( "SELECT uuid, ref_id FROM ttrss_user_entries WHERE int_id = '$param'
+		$result = db_query("SELECT uuid, ref_id FROM ttrss_user_entries WHERE int_id = '$param'
 			AND owner_uid = " . $_SESSION['uid']);
 
 		if (db_num_rows($result) == 0) {
@@ -39,8 +39,8 @@ class Share extends Plugin {
 			$ref_id = db_fetch_result($result, 0, "ref_id");
 
 			if (!$uuid) {
-				$uuid = db_escape_string( sha1(uniqid(rand(), true)));
-				db_query( "UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param'
+				$uuid = db_escape_string(sha1(uniqid(rand(), true)));
+				db_query("UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param'
 					AND owner_uid = " . $_SESSION['uid']);
 			}
 
@@ -53,10 +53,10 @@ class Share extends Plugin {
 			print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
 			print "</div>";
 
-			/* if (!label_find_id( __('Shared'), $_SESSION["uid"]))
-				label_create( __('Shared'), $_SESSION["uid"]);
+			/* if (!label_find_id(__('Shared'), $_SESSION["uid"]))
+				label_create(__('Shared'), $_SESSION["uid"]);
 
-			label_add_article( $ref_id, __('Shared'), $_SESSION['uid']); */
+			label_add_article($ref_id, __('Shared'), $_SESSION['uid']); */
 		}
 
 		print "<div align='center'>";
diff --git a/plugins/updater/init.php b/plugins/updater/init.php
index 856a0cbf9..2ae4c4109 100644
--- a/plugins/updater/init.php
+++ b/plugins/updater/init.php
@@ -20,7 +20,7 @@ class Updater extends Plugin {
 			$this);
 	}
 
-	function update_self_step( $step, $params, $force = false) {
+	function update_self_step($step, $params, $force = false) {
 		// __FILE__ is in plugins/updater so we need to go one level up
 		$work_dir = dirname(dirname(dirname(__FILE__)));
 		$parent_dir = dirname($work_dir);
@@ -277,13 +277,13 @@ class Updater extends Plugin {
 		return array("step" => $step, "stop" => $stop, "params" => $params, "log" => $log);
 	}
 
-	function update_self_cli( $force = false) {
+	function update_self_cli($force = false) {
 		$step = 0;
 		$stop = false;
 		$params = array();
 
 		while (!$stop) {
-			$rc = $this->update_self_step( $step, $params, $force);
+			$rc = $this->update_self_step($step, $params, $force);
 
 			$params = $rc['params'];
 			$stop = $rc['stop'];
@@ -307,7 +307,7 @@ class Updater extends Plugin {
 		if ($input != 'yes' && $input != 'force')
 			exit;
 
-		$this->update_self_cli( $input == 'force');
+		$this->update_self_cli($input == 'force');
 	}
 
 	function get_prefs_js() {
@@ -376,7 +376,7 @@ class Updater extends Plugin {
 		$force = (bool) $_REQUEST["force"];
 
 		if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) {
-			print	json_encode($this->update_self_step( $step, $params, $force));
+			print	json_encode($this->update_self_step($step, $params, $force));
 		}
 	}
 
-- 
cgit v1.2.3-54-g00ecf


From a08f94bd0e177c4ffaf9211e0e4c3872a68ac35b Mon Sep 17 00:00:00 2001
From: Matthias Wirtz <matthias.wirtz@hotmail.de>
Date: Wed, 17 Apr 2013 20:24:07 +0200
Subject: make us of db_affected_rows($result) instead of using db specific
 functions

---
 include/functions.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 66d5896d1..8215127de 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -223,8 +223,6 @@
 					ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'");
 			}
 
-			$rows = pg_affected_rows($result);
-
 		} else {
 
 /*			$result = db_query("DELETE FROM ttrss_user_entries WHERE
@@ -239,11 +237,10 @@
 				feed_id = '$feed_id' AND
 				$query_limit
 				ttrss_entries.date_updated < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)");
-
-			$rows = mysql_affected_rows();
-
 		}
 
+		$rows = db_affected_rows($result);
+		
 		ccache_update($feed_id, $owner_uid);
 
 		if ($debug) {
-- 
cgit v1.2.3-54-g00ecf


From 3f6f085769de4df84e831eefb767c4cdbfb7c64b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 11:35:58 +0400
Subject: add better gzdecode support for php native fetch, use curl under
 open_basedir

---
 include/functions.php | 16 ++++++++++++----
 include/rssfuncs.php  |  8 ++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 8215127de..42aebec83 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -8,6 +8,7 @@
 	$fetch_last_error = false;
 	$fetch_last_error_code = false;
 	$fetch_last_content_type = false;
+	$fetch_curl_used = false;
 	$pluginhost = false;
 
 	mb_internal_encoding("UTF-8");
@@ -240,7 +241,7 @@
 		}
 
 		$rows = db_affected_rows($result);
-		
+
 		ccache_update($feed_id, $owner_uid);
 
 		if ($debug) {
@@ -305,10 +306,13 @@
 		global $fetch_last_error;
 		global $fetch_last_error_code;
 		global $fetch_last_content_type;
+		global $fetch_curl_used;
 
 		$url = str_replace(' ', '%20', $url);
 
-		if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) {
+		if (!defined('NO_CURL') && function_exists('curl_init')) {
+
+			$fetch_curl_used = true;
 
 			if (ini_get("safe_mode") || ini_get("open_basedir")) {
 				$ch = curl_init(geturl($url));
@@ -330,7 +334,7 @@
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 			curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
 			curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
-			curl_setopt($ch, CURLOPT_ENCODING , "gzip");
+			curl_setopt($ch, CURLOPT_ENCODING, "");
 			curl_setopt($ch, CURLOPT_REFERER, $url);
 
 			if ($post_query) {
@@ -373,6 +377,9 @@
 
 			return $contents;
 		} else {
+
+			$fetch_curl_used = false;
+
 			if ($login && $pass){
 				$url_parts = array();
 
@@ -4064,7 +4071,8 @@
 
 	function geturl($url){
 
-		(function_exists('curl_init')) ? '' : die('cURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini');
+		if (!function_exists('curl_init'))
+			return user_error('CURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini', E_USER_ERROR);
 
 		$curl = curl_init();
 		$header[0] = "Accept: text/xml,application/xml,application/xhtml+xml,";
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 537a4c338..494e050a6 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -304,6 +304,14 @@
 					$no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
 					$force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp));
 
+				global $fetch_curl_used;
+
+				if (!$fetch_curl_used) {
+					$tmp = @gzdecode($feed_data);
+
+					if ($tmp) $feed_data = $tmp;
+				}
+
 				if ($debug_enabled) {
 					_debug("update_rss_feed: fetch done.");
 				}
-- 
cgit v1.2.3-54-g00ecf


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 -
 include/db-prefs.php       | 179 +-----------------------------------------
 include/functions.php      |   4 -
 include/rssfuncs.php       |   2 -
 7 files changed, 192 insertions(+), 190 deletions(-)
 create mode 100644 classes/db/prefs.php

(limited to 'include/functions.php')

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() {
diff --git a/include/db-prefs.php b/include/db-prefs.php
index 8336b0cfe..d122f3baf 100644
--- a/include/db-prefs.php
+++ b/include/db-prefs.php
@@ -1,186 +1,11 @@
 <?php
-	require_once "config.php";
 	require_once "db.php";
 
-	if (!defined('DISABLE_SESSIONS') && !defined('PREFS_NO_CACHE')) {
-		if (!$_SESSION["prefs_cache"])
-			$_SESSION["prefs_cache"] = array();
-	}
-
-	function cache_prefs() {
-		$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"];
-
-				$_SESSION["prefs_cache"][$pref_name]["type"] = $line["type_name"];
-				$_SESSION["prefs_cache"][$pref_name]["value"] = $line["value"];
-			}
-		}
-	}
-
 	function get_pref($pref_name, $user_id = false, $die_on_error = false) {
-
-		$pref_name = db_escape_string($pref_name);
-		$prefs_cache = true;
-		$profile = false;
-
-		if (!$user_id) {
-			$user_id = $_SESSION["uid"];
-			@$profile = $_SESSION["profile"];
-		} else {
-			$user_id = sprintf("%d", $user_id);
-			//$prefs_cache = false;
-		}
-
-		if ($prefs_cache && !defined('DISABLE_SESSIONS') && !defined('PREFS_NO_CACHE')) {
-			if ($_SESSION["prefs_cache"] && @$_SESSION["prefs_cache"][$pref_name]) {
-				$tuple = $_SESSION["prefs_cache"][$pref_name];
-				return convert_pref_type($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 (!defined('DISABLE_SESSIONS')) {
-				if ($user_id == $_SESSION["uid"]) {
-					$_SESSION["prefs_cache"][$pref_name]["type"] = $type_name;
-					$_SESSION["prefs_cache"][$pref_name]["value"] = $value;
-				}
-			}
-
-			return convert_pref_type($value, $type_name);
-
-		} else {
-			if ($die_on_error) {
-				user_error("Fatal error, unknown preferences key: $pref_name", E_USER_ERROR);
-			} else {
-				return null;
-			}
-		}
-	}
-
-	function convert_pref_type($value, $type_name) {
-		if ($type_name == "bool") {
-			return $value == "true";
-		} else if ($type_name == "integer") {
-			return sprintf("%d", $value);
-		} else {
-			return $value;
-		}
+		return Db_Prefs::get()->read($pref_name, $user_id, $die_on_error);
 	}
 
 	function set_pref($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 (!defined('DISABLE_SESSIONS') && !defined('PREFS_NO_CACHE')) {
-			if ($_SESSION["prefs_cache"] && @$_SESSION["prefs_cache"][$pref_name]) {
-				$type_name = $_SESSION["prefs_cache"][$pref_name]["type"];
-				$current_value = $_SESSION["prefs_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 (!defined('DISABLE_SESSIONS')) {
-				if ($user_id == $_SESSION["uid"]) {
-					$_SESSION["prefs_cache"][$pref_name]["type"] = $type_name;
-					$_SESSION["prefs_cache"][$pref_name]["value"] = $value;
-				}
-			}
-		}
+		return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags);
 	}
 ?>
diff --git a/include/functions.php b/include/functions.php
index 42aebec83..3c8e9d62c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -744,12 +744,9 @@
 	}
 
 	function login_sequence() {
-		$_SESSION["prefs_cache"] = false;
-
 		if (SINGLE_USER_MODE) {
 			@session_start();
 			authenticate_user("admin", null);
-			cache_prefs();
 			load_user_plugins($_SESSION["uid"]);
 		} else {
 			if (!validate_session()) $_SESSION["uid"] = false;
@@ -783,7 +780,6 @@
 			}
 
 			if ($_SESSION["uid"]) {
-				cache_prefs();
 				load_user_plugins($_SESSION["uid"]);
 
 				/* cleanup ccache */
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 494e050a6..b2d7e0c59 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -127,8 +127,6 @@
 				$updstart_thresh_qpart
 			ORDER BY $random_qpart $query_limit");
 
-		$user_prefs_cache = array();
-
 		if($debug) _debug(sprintf("Scheduled %d feeds to update...", db_num_rows($result)));
 
 		// Here is a little cache magic in order to minimize risk of double feed updates.
-- 
cgit v1.2.3-54-g00ecf


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

---
 backend.php                |  3 +--
 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 +--
 include/functions.php      | 65 ++++++++++++++++------------------------------
 include/rssfuncs.php       | 12 ++++-----
 index.php                  | 25 ++++++------------
 plugins/instances/init.php |  3 +--
 prefs.php                  |  6 ++---
 public.php                 |  3 +--
 update.php                 | 12 ++++-----
 19 files changed, 89 insertions(+), 148 deletions(-)

(limited to 'include/functions.php')

diff --git a/backend.php b/backend.php
index d3d8622d9..c69d6d98b 100644
--- a/backend.php
+++ b/backend.php
@@ -113,8 +113,7 @@
 
 	$op = str_replace("-", "_", $op);
 
-	global $pluginhost;
-	$override = $pluginhost->lookup_handler($op, $method);
+	$override = PluginHost::getInstance()->lookup_handler($op, $method);
 
 	if (class_exists($op) || $override) {
 
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
diff --git a/include/functions.php b/include/functions.php
index 3c8e9d62c..9f890eba7 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -9,7 +9,6 @@
 	$fetch_last_error_code = false;
 	$fetch_last_content_type = false;
 	$fetch_curl_used = false;
-	$pluginhost = false;
 
 	mb_internal_encoding("UTF-8");
 	date_default_timezone_set('UTC');
@@ -622,8 +621,7 @@
 		if (!SINGLE_USER_MODE) {
 			$user_id = false;
 
-			global $pluginhost;
-			foreach ($pluginhost->get_hooks($pluginhost::HOOK_AUTH_USER) as $plugin) {
+			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_AUTH_USER) as $plugin) {
 
 				$user_id = (int) $plugin->authenticate($login, $password);
 
@@ -734,11 +732,10 @@
 		if ($owner_uid) {
 			$plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-			global $pluginhost;
-			$pluginhost->load($plugins, $pluginhost::KIND_USER, $owner_uid);
+			PluginHost::getInstance()->load($plugins, PluginHost::KIND_USER, $owner_uid);
 
 			if (get_schema_version() > 100) {
-				$pluginhost->load_data();
+				PluginHost::getInstance()->load_data();
 			}
 		}
 	}
@@ -1443,18 +1440,13 @@
 			array_push($ret_arr, $cv);
 		}
 
-		global $pluginhost;
-
-		if ($pluginhost) {
-			$feeds = $pluginhost->get_feeds(-1);
-
-			if (is_array($feeds)) {
-				foreach ($feeds as $feed) {
-					$cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
-						"counter" => $feed['sender']->get_unread($feed['id']));
+		$feeds = PluginHost::getInstance()->get_feeds(-1);
 
+		if (is_array($feeds)) {
+			foreach ($feeds as $feed) {
+				$cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
+					"counter" => $feed['sender']->get_unread($feed['id']));
 					array_push($ret_arr, $cv);
-				}
 			}
 		}
 
@@ -1982,8 +1974,7 @@
 				"help_dialog" => __("Show help dialog"))
 			);
 
-		global $pluginhost;
-		foreach ($pluginhost->get_hooks($pluginhost::HOOK_HOTKEY_INFO) as $plugin) {
+		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HOTKEY_INFO) as $plugin) {
 			$hotkeys = $plugin->hook_hotkey_info($hotkeys);
 		}
 
@@ -2059,8 +2050,7 @@
 			$hotkeys["^(40)|Ctrl-down"] = "next_article_noscroll";
 		}
 
-		global $pluginhost;
-		foreach ($pluginhost->get_hooks($pluginhost::HOOK_HOTKEY_MAP) as $plugin) {
+		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HOTKEY_MAP) as $plugin) {
 			$hotkeys = $plugin->hook_hotkey_map($hotkeys);
 		}
 
@@ -2753,18 +2743,14 @@
 
 		$disallowed_attributes = array('id', 'style', 'class');
 
-		global $pluginhost;
-
-		if (isset($pluginhost)) {
-			foreach ($pluginhost->get_hooks($pluginhost::HOOK_SANITIZE) as $plugin) {
-				$retval = $plugin->hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes);
-				if (is_array($retval)) {
-					$doc = $retval[0];
-					$allowed_elements = $retval[1];
-					$disallowed_attributes = $retval[2];
-				} else {
-					$doc = $retval;
-				}
+		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SANITIZE) as $plugin) {
+			$retval = $plugin->hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes);
+			if (is_array($retval)) {
+				$doc = $retval[0];
+				$allowed_elements = $retval[1];
+				$disallowed_attributes = $retval[2];
+			} else {
+				$doc = $retval;
 			}
 		}
 
@@ -3065,9 +3051,7 @@
 
 			$line["content"] = sanitize($line["content"], false, $owner_uid,	$line["site_url"]);
 
-			global $pluginhost;
-
-			foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE) as $p) {
+			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
 				$line = $p->hook_render_article($line);
 			}
 
@@ -3142,8 +3126,7 @@
 					id=\"ATSTRTIP-$id\" connectId=\"ATSTR-$id\"
 					position=\"below\">$tags_str_full</div>";
 
-				global $pluginhost;
-				foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_BUTTON) as $p) {
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
 					$rv['content'] .= $p->hook_article_button($line);
 				}
 
@@ -3154,8 +3137,7 @@
 			$rv['content'] .= "</div>";
 			$rv['content'] .= "<div clear='both'>";
 
-			global $pluginhost;
-			foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
+			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
 				$rv['content'] .= $p->hook_article_left_button($line);
 			}
 
@@ -3361,10 +3343,7 @@
 	}
 
 	function init_plugins() {
-		global $pluginhost;
-
-		$pluginhost = new PluginHost(Db::get());
-		$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
+		PluginHost::getInstance()->load(PLUGINS, PluginHost::KIND_ALL);
 
 		return true;
 	}
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index b2d7e0c59..9c80a72d6 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -343,15 +343,15 @@
 			}
 		}
 
-		$pluginhost = new PluginHost(Db::get());
+		$pluginhost = new PluginHost();
 		$pluginhost->set_debug($debug_enabled);
 		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-		$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
-		$pluginhost->load($user_plugins, $pluginhost::KIND_USER, $owner_uid);
+		$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+		$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
 		$pluginhost->load_data();
 
-		foreach ($pluginhost->get_hooks($pluginhost::HOOK_FEED_FETCHED) as $plugin) {
+		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
 			$feed_data = $plugin->hook_feed_fetched($feed_data);
 		}
 
@@ -388,7 +388,7 @@
 			}
 
 			// We use local pluginhost here because we need to load different per-user feed plugins
-			$pluginhost->run_hooks($pluginhost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss);
+			$pluginhost->run_hooks(PluginHost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss);
 
 			if ($debug_enabled) {
 				_debug("update_rss_feed: processing feed data...");
@@ -673,7 +673,7 @@
 					"author" => $entry_author,
 					"stored" => $stored_article);
 
-				foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_FILTER) as $plugin) {
+				foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
 					$article = $plugin->hook_article_filter($article);
 				}
 
diff --git a/index.php b/index.php
index d8b584071..bf78be1f3 100644
--- a/index.php
+++ b/index.php
@@ -32,16 +32,14 @@
 
 	if (!init_plugins()) return;
 
-	global $pluginhost;
-
 	if (!$_REQUEST['mobile']) {
-		if ($mobile->isTablet() && $pluginhost->get_plugin("digest")) {
+		if ($mobile->isTablet() && PluginHost::getInstance()->get_plugin("digest")) {
 			header('Location: backend.php?op=digest');
 			exit;
-		} else if ($mobile->isMobile() && $pluginhost->get_plugin("mobile")) {
+		} else if ($mobile->isMobile() && PluginHost::getInstance()->get_plugin("mobile")) {
 			header('Location: backend.php?op=mobile');
 			exit;
-		} else if ($mobile->isMobile() && $pluginhost->get_plugin("digest")) {
+		} else if ($mobile->isMobile() && PluginHost::getInstance()->get_plugin("digest")) {
 			header('Location: backend.php?op=digest');
 			exit;
 		}
@@ -74,7 +72,7 @@
 
 	<style type="text/css">
 	<?php
-		foreach ($pluginhost->get_plugins() as $n => $p) {
+		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_css")) {
 				echo $p->get_css();
 			}
@@ -104,9 +102,7 @@
 		print get_minified_js(array("tt-rss",
 			"functions", "feedlist", "viewfeed", "FeedTree"));
 
-		global $pluginhost;
-
-		foreach ($pluginhost->get_plugins() as $n => $p) {
+		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_js")) {
 				echo JShrink\Minifier::minify($p->get_js());
 			}
@@ -205,8 +201,7 @@
 		<div class="actionChooser">
 
 			<?php
-				global $pluginhost;
-				foreach ($pluginhost->get_hooks($pluginhost::HOOK_TOOLBAR_BUTTON) as $p) {
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) {
 					 echo $p->hook_toolbar_button();
 				}
 			?>
@@ -238,18 +233,14 @@
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
 					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
-					<!-- <?php if ($pluginhost->get_plugin("digest")) { ?>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
-					<?php } ?> -->
-						<!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div> -->
-						<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagSelect')"><?php echo __('Select by tags...') ?></div>
 					<!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div> -->
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
 
 					<?php
-						foreach ($pluginhost->get_hooks($pluginhost::HOOK_ACTION_ITEM) as $p) {
+						foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
 						 echo $p->hook_action_item();
 						}
 					?>
diff --git a/plugins/instances/init.php b/plugins/instances/init.php
index a87684b56..d59e17ffd 100644
--- a/plugins/instances/init.php
+++ b/plugins/instances/init.php
@@ -351,8 +351,7 @@ class Instances extends Plugin implements IHandler {
 
 		print "</div>"; #pane
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
 			"hook_prefs_tab", "prefInstances");
 
 		print "</div>"; #container
diff --git a/prefs.php b/prefs.php
index 826728315..9bf610a53 100644
--- a/prefs.php
+++ b/prefs.php
@@ -66,9 +66,7 @@
 	<?php
 		require 'lib/jshrink/Minifier.php';
 
-		global $pluginhost;
-
-		foreach ($pluginhost->get_plugins() as $n => $p) {
+		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_prefs_js")) {
 				echo JShrink\Minifier::minify($p->get_prefs_js());
 			}
@@ -134,7 +132,7 @@
 		title="<?php echo __('System') ?>"></div>
 <?php } ?>
 <?php
-	$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TABS,
+	PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS,
 		"hook_prefs_tabs", false);
 ?>
 </div>
diff --git a/public.php b/public.php
index 2f5081957..f92d252e2 100644
--- a/public.php
+++ b/public.php
@@ -37,8 +37,7 @@
 
 	$method = $_REQUEST["op"];
 
-	global $pluginhost;
-	$override = $pluginhost->lookup_handler("public", $method);
+	$override = PluginHost::getInstance()->lookup_handler("public", $method);
 
 	if ($override) {
 		$handler = $override;
diff --git a/update.php b/update.php
index be7314175..d8ea52361 100755
--- a/update.php
+++ b/update.php
@@ -36,7 +36,7 @@
 			"list-plugins",
 			"help");
 
-	foreach ($pluginhost->get_commands() as $command => $data) {
+	foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
 		array_push($longopts, $command . $data["suffix"]);
 	}
 
@@ -79,7 +79,7 @@
 		print "  --help               - show this help\n";
 		print "Plugin options:\n";
 
-		foreach ($pluginhost->get_commands() as $command => $data) {
+		foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
 			$args = $data['arghelp'];
 			printf(" --%-19s - %s\n", "$command $args", $data["description"]);
 		}
@@ -161,8 +161,7 @@
 		$rc = cleanup_tags( 14, 50000);
 		_debug("Cleaned $rc cached tags.");
 
-		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);
 	}
 
 	if (isset($options["feedbrowser"])) {
@@ -200,8 +199,7 @@
 
 			_debug("Cleaned $rc cached tags.");
 
-			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);
 		}
 
 	}
@@ -368,7 +366,7 @@
 
 	}
 
-	$pluginhost->run_commands($options);
+	PluginHost::getInstance()->run_commands($options);
 
 	if ($lock_handle != false) {
 		fclose($lock_handle);
-- 
cgit v1.2.3-54-g00ecf


From 6d9426feae3d80272722de2fda6ee9e0056569ca Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 16:18:20 +0400
Subject: tweak notice/warning/etc display

---
 include/functions.php | 6 +++---
 tt-rss.css            | 2 +-
 utility.css           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 9f890eba7..e0c102b38 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2925,19 +2925,19 @@
 	function format_warning($msg, $id = "") {
 		global $link;
 		return "<div class=\"warning\" id=\"$id\">
-			<img src=\"images/sign_excl.svg\"><div class='inner'>$msg</div></div>";
+			<img src=\"images/sign_excl.svg\">$msg</div>";
 	}
 
 	function format_notice($msg, $id = "") {
 		global $link;
 		return "<div class=\"notice\" id=\"$id\">
-			<img src=\"images/sign_info.svg\"><div class='inner'>$msg</div></div>";
+			<img src=\"images/sign_info.svg\">$msg</div>";
 	}
 
 	function format_error($msg, $id = "") {
 		global $link;
 		return "<div class=\"error\" id=\"$id\">
-			<img src=\"images/sign_excl.svg\"><div class='inner'>$msg</div></div>";
+			<img src=\"images/sign_excl.svg\">$msg</div>";
 	}
 
 	function print_notice($msg) {
diff --git a/tt-rss.css b/tt-rss.css
index 8e87d6598..8bf591326 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -287,8 +287,8 @@ div.error {
 
 div.warning img, div.notice img, div.error img {
 	margin-right : 4px;
-	float : left;
 	vertical-align : middle;
+	display : table-cell;
 }
 
 ul.nomarks {
diff --git a/utility.css b/utility.css
index 65dc20b1e..d4b6d0a02 100644
--- a/utility.css
+++ b/utility.css
@@ -73,7 +73,7 @@ div.error {
 
 div.warning img, div.notice img, div.error img {
 	margin-right : 4px;
-	float : left;
+	display : table-cell;
 	vertical-align : middle;
 }
 
-- 
cgit v1.2.3-54-g00ecf


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 +-
 include/functions.php      | 6 +++---
 install/index.php          | 5 +++--
 tt-rss.css                 | 5 +++++
 utility.css                | 4 ++++
 5 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'include/functions.php')

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")."\">
diff --git a/include/functions.php b/include/functions.php
index e0c102b38..0908bf8d3 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2925,19 +2925,19 @@
 	function format_warning($msg, $id = "") {
 		global $link;
 		return "<div class=\"warning\" id=\"$id\">
-			<img src=\"images/sign_excl.svg\">$msg</div>";
+			<span><img src=\"images/sign_excl.svg\"></span><span>$msg</span></div>";
 	}
 
 	function format_notice($msg, $id = "") {
 		global $link;
 		return "<div class=\"notice\" id=\"$id\">
-			<img src=\"images/sign_info.svg\">$msg</div>";
+			<span><img src=\"images/sign_info.svg\"></span><span>$msg</span></div>";
 	}
 
 	function format_error($msg, $id = "") {
 		global $link;
 		return "<div class=\"error\" id=\"$id\">
-			<img src=\"images/sign_excl.svg\">$msg</div>";
+			<span><img src=\"images/sign_excl.svg\"></span><span>$msg</span></div>";
 	}
 
 	function print_notice($msg) {
diff --git a/install/index.php b/install/index.php
index 9cbab20f1..416765e8f 100644
--- a/install/index.php
+++ b/install/index.php
@@ -80,12 +80,13 @@
 	}
 
 	function print_error($msg) {
-		print "<div class='error'><img src='../images/sign_excl.svg'> $msg</div>";
+		print "<div class='error'><span><img src='../images/sign_excl.svg'></span>
+			<span>$msg</span></div>";
 	}
 
 	function print_notice($msg) {
 		print "<div class=\"notice\">
-			<img src=\"../images/sign_info.svg\">$msg</div>";
+			<span><img src=\"../images/sign_info.svg\"></span><span>$msg</span></div>";
 	}
 
 	function db_connect($host, $user, $pass, $db, $type, $port) {
diff --git a/tt-rss.css b/tt-rss.css
index 8bf591326..454e2ffd1 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -288,7 +288,12 @@ div.error {
 div.warning img, div.notice img, div.error img {
 	margin-right : 4px;
 	vertical-align : middle;
+}
+
+div.warning span, div.notice span, div.error span {
 	display : table-cell;
+	vertical-align : middle;
+
 }
 
 ul.nomarks {
diff --git a/utility.css b/utility.css
index d4b6d0a02..50a54e154 100644
--- a/utility.css
+++ b/utility.css
@@ -73,6 +73,10 @@ div.error {
 
 div.warning img, div.notice img, div.error img {
 	margin-right : 4px;
+	vertical-align : middle;
+}
+
+div.warning span, div.notice span, div.error span {
 	display : table-cell;
 	vertical-align : middle;
 }
-- 
cgit v1.2.3-54-g00ecf


From df25e4d221d20d358132c06510b23c852072d557 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 19 Apr 2013 09:48:09 +0400
Subject: check if http_response_header is defined

---
 include/functions.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 0908bf8d3..4cc8f134d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -394,11 +394,13 @@
 			$data = @file_get_contents($url);
 
 			$fetch_last_content_type = false;  // reset if no type was sent from server
-			foreach ($http_response_header as $h) {
-				if (substr(strtolower($h), 0, 13) == 'content-type:') {
-					$fetch_last_content_type = substr($h, 14);
-					// don't abort here b/c there might be more than one
-					// e.g. if we were being redirected -- last one is the right one
+			if (is_array($http_response_header)) {
+				foreach ($http_response_header as $h) {
+					if (substr(strtolower($h), 0, 13) == 'content-type:') {
+						$fetch_last_content_type = substr($h, 14);
+						// don't abort here b/c there might be more than one
+						// e.g. if we were being redirected -- last one is the right one
+					}
 				}
 			}
 
-- 
cgit v1.2.3-54-g00ecf


From ebec81a6fb2dff0b2fe6b569b021e057995ee6c7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 13:17:28 +0400
Subject: subscribe: verify XML before adding to the database; fetch: try to
 work around entity problems if initial parsing fails

---
 include/functions.php | 19 +++++++++++++++++++
 include/rssfuncs.php  | 29 ++++++++++++++++++++++++++++-
 js/functions.js       | 38 +++++---------------------------------
 3 files changed, 52 insertions(+), 34 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 4cc8f134d..8ac5753c9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1558,6 +1558,7 @@
 	 *                     Here you should call extractfeedurls in rpc-backend
 	 *                     to get all possible feeds.
 	 *                 5 - Couldn't download the URL content.
+	 *                 6 - Content is an invalid XML.
 	 */
 	function subscribe_to_feed($url, $cat_id = 0,
 			$auth_login = '', $auth_pass = '') {
@@ -1588,6 +1589,18 @@
 			$url = key($feedUrls);
 		}
 
+		libxml_use_internal_errors(true);
+		$doc = new DOMDocument();
+		$doc->loadXML(html_entity_decode($contents));
+		$error = libxml_get_last_error();
+		libxml_clear_errors();
+
+		if ($error) {
+			$error_message = format_libxml_error($error);
+
+			return array("code" => 6, "message" => $error_message);
+		}
+
 		if ($cat_id == "0" || !$cat_id) {
 			$cat_qpart = "NULL";
 		} else {
@@ -4203,4 +4216,10 @@
 		return LABEL_BASE_INDEX - 1 + abs($feed);
 	}
 
+	function format_libxml_error($error) {
+		return T_sprintf("LibXML error %s at line %d (column %d): %s",
+				$error->code, $error->line, $error->column,
+				$error->message);
+	}
+
 ?>
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 31d35bf8e..47d622169 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -316,6 +316,25 @@
 					_debug("update_rss_feed: fetch done.");
 				}
 
+				$error = verify_feed_xml($feed_data);
+
+				if ($error) {
+					if ($debug_enabled) {
+						_debug("update_rss_feed: error verifying XML, code: " . $error->code);
+					}
+
+					if ($error->code == 26) {
+						if ($debug_enabled) {
+							_debug("update_rss_feed: got error 26, trying to decode entities...");
+						}
+
+						$feed_data = html_entity_decode($feed_data, ENT_COMPAT, 'UTF-8');
+
+						$error = verify_feed_xml($feed_data);
+
+						if ($error) $feed_data = '';
+					}
+				}
 			}
 
 			if (!$feed_data) {
@@ -559,7 +578,7 @@
 					_debug("update_rss_feed: date $entry_timestamp [$entry_timestamp_fmt]");
 				}
 
-				$entry_title = html_entity_decode($item->get_title());
+				$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
 
 				$entry_link = rewrite_relative_url($site_url, $item->get_link());
 
@@ -1421,5 +1440,13 @@
 			mb_strtolower(strip_tags($title), 'utf-8'));
 	}
 
+	function verify_feed_xml($feed_data) {
+		libxml_use_internal_errors(true);
+		$doc = new DOMDocument();
+		$doc->loadXML($feed_data);
+		$error = libxml_get_last_error();
+		libxml_clear_errors();
+		return $error;
+	}
 
 ?>
diff --git a/js/functions.js b/js/functions.js
index e02767504..04be58bf7 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -816,39 +816,6 @@ function quickAddFeed() {
 									alert(__("Specified URL doesn't seem to contain any feeds."));
 									break;
 								case 4:
-									/* notify_progress("Searching for feed urls...", true);
-
-									new Ajax.Request("backend.php", {
-										parameters: 'op=rpc&method=extractfeedurls&url=' + param_escape(feed_url),
-										onComplete: function(transport, dialog, feed_url) {
-
-											notify('');
-
-											var reply = JSON.parse(transport.responseText);
-
-											var feeds = reply['urls'];
-
-											console.log(transport.responseText);
-
-											var select = dijit.byId("feedDlg_feedContainerSelect");
-
-											while (select.getOptions().length > 0)
-												select.removeOption(0);
-
-											var count = 0;
-											for (var feedUrl in feeds) {
-												select.addOption({value: feedUrl, label: feeds[feedUrl]});
-												count++;
-											}
-
-//											if (count > 5) count = 5;
-//											select.size = count;
-
-											Effect.Appear('feedDlg_feedsContainer', {duration : 0.5});
-										}
-									});
-									break; */
-
 									feeds = rc['feeds'];
 
 									var select = dijit.byId("feedDlg_feedContainerSelect");
@@ -871,6 +838,11 @@ function quickAddFeed() {
 									alert(__("Couldn't download the specified URL: %s").
 											replace("%s", rc['message']));
 									break;
+								case 6:
+									alert(__("XML validation failed: %s").
+											replace("%s", rc['message']));
+									break;
+									break;
 								case 0:
 									alert(__("You are already subscribed to this feed."));
 									break;
-- 
cgit v1.2.3-54-g00ecf


From 9ec103525da078d46fc2cf0a5ed34a690385120c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 13:24:51 +0400
Subject: update_rss_feed: simplify debug reporting

---
 include/functions.php |  16 ++++
 include/rssfuncs.php  | 208 ++++++++++++++------------------------------------
 2 files changed, 74 insertions(+), 150 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 8ac5753c9..004f4db2f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -129,6 +129,9 @@
 	$utc_tz = new DateTimeZone('UTC');
 	$schema_version = false;
 
+	global $_debug_enabled;
+	$_debug_enabled = true;
+
 	/**
 	 * Print a timestamped debug message.
 	 *
@@ -136,6 +139,10 @@
 	 * @return void
 	 */
 	function _debug($msg) {
+		global $_debug_enabled;
+
+		if (!$_debug_enabled) return;
+
 		$ts = strftime("%H:%M:%S", time());
 		if (function_exists('posix_getpid')) {
 			$ts = "$ts/" . posix_getpid();
@@ -156,6 +163,15 @@
 
 	} // function _debug
 
+	function _debug_enable($enabled) {
+		global $_debug_enabled;
+
+		$old = $_debug_enabled;
+		$_debug_enabled = $enabled;
+
+		return $old;
+	}
+
 	/**
 	 * Purge a feed old posts.
 	 *
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 47d622169..2f9ba4260 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -201,9 +201,9 @@
 
 		$debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
 
-		if ($debug_enabled) {
-			_debug("update_rss_feed: start");
-		}
+		$prev_debug_enabled = _debug_enable($debug_enabled);
+
+		_debug("start");
 
 		$result = db_query("SELECT id,update_interval,auth_login,
 			feed_url,auth_pass,cache_images,last_updated,
@@ -212,9 +212,7 @@
 			FROM ttrss_feeds WHERE id = '$feed'");
 
 		if (db_num_rows($result) == 0) {
-			if ($debug_enabled) {
-				_debug("update_rss_feed: feed $feed NOT FOUND/SKIPPED");
-			}
+			_debug("feed $feed NOT FOUND/SKIPPED");
 			return false;
 		}
 
@@ -252,10 +250,8 @@
 		$cache_age = ($no_cache || is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ?
 			30 : get_feed_update_interval($feed) * 60;
 
-		if ($debug_enabled) {
-			_debug("update_rss_feed: cache filename: $cache_filename exists: " . file_exists($cache_filename));
-			_debug("update_rss_feed: cache age: $cache_age; no cache: $no_cache");
-		}
+		_debug("cache filename: $cache_filename exists: " . file_exists($cache_filename));
+		_debug("cache age: $cache_age; no cache: $no_cache");
 
 		$cached_feed_data_hash = false;
 
@@ -271,9 +267,7 @@
 			!$auth_login && !$auth_pass &&
 			filemtime($cache_filename) > time() - $cache_age) {
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: using local cache.");
-				}
+				_debug("using local cache.");
 
 				if ($cache_timestamp > $last_updated_timestamp) {
 					@$rss_data = file_get_contents($cache_filename);
@@ -283,9 +277,7 @@
 						@$rss = unserialize($rss_data);
 					}
 				} else if (!$force_refetch) {
-					if ($debug_enabled) {
-						_debug("update_rss_feed: local cache valid and older than last_updated, nothing to do.");
-					}
+					_debug("local cache valid and older than last_updated, nothing to do.");
 					return;
 				}
 		}
@@ -293,9 +285,7 @@
 		if (!$rss) {
 
 			if (!$feed_data) {
-				if ($debug_enabled) {
-					_debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)");
-				}
+				_debug("fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)");
 
 				$feed_data = fetch_file_contents($fetch_url, false,
 					$auth_login, $auth_pass, false,
@@ -312,21 +302,15 @@
 
 				$feed_data = trim($feed_data);
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: fetch done.");
-				}
+				_debug("fetch done.");
 
 				$error = verify_feed_xml($feed_data);
 
 				if ($error) {
-					if ($debug_enabled) {
-						_debug("update_rss_feed: error verifying XML, code: " . $error->code);
-					}
+					_debug("error verifying XML, code: " . $error->code);
 
 					if ($error->code == 26) {
-						if ($debug_enabled) {
-							_debug("update_rss_feed: got error 26, trying to decode entities...");
-						}
+						_debug("got error 26, trying to decode entities...");
 
 						$feed_data = html_entity_decode($feed_data, ENT_COMPAT, 'UTF-8');
 
@@ -341,9 +325,7 @@
 				global $fetch_last_error;
 				global $fetch_last_error_code;
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: unable to fetch: $fetch_last_error [$fetch_last_error_code]");
-				}
+				_debug("unable to fetch: $fetch_last_error [$fetch_last_error_code]");
 
 				$error_escaped = '';
 
@@ -351,9 +333,7 @@
 				if ($fetch_last_error_code != 304) {
 					$error_escaped = db_escape_string($fetch_last_error);
 				} else {
-					if ($debug_enabled) {
-						_debug("update_rss_feed: source claims data not modified, nothing to do.");
-					}
+					_debug("source claims data not modified, nothing to do.");
 				}
 
 				db_query(
@@ -401,9 +381,7 @@
 				$new_rss_hash = sha1($rss_data);
 
 				if ($new_rss_hash != $rss_hash) {
-					if ($debug_enabled) {
-						_debug("update_rss_feed: saving $cache_filename");
-					}
+					_debug("saving $cache_filename");
 					@file_put_contents($cache_filename, serialize($rss));
 				}
 			}
@@ -411,9 +389,7 @@
 			// We use local pluginhost here because we need to load different per-user feed plugins
 			$pluginhost->run_hooks(PluginHost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss);
 
-			if ($debug_enabled) {
-				_debug("update_rss_feed: processing feed data...");
-			}
+			_debug("processing feed data...");
 
 //			db_query("BEGIN");
 
@@ -438,9 +414,7 @@
 			$site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
 
 			if ($favicon_needs_check || $force_refetch) {
-				if ($debug_enabled) {
-					_debug("update_rss_feed: checking favicon...");
-				}
+				_debug("checking favicon...");
 
 				check_feed_favicon($site_url, $feed, $link);
 				$favicon_file = ICONS_DIR . "/$feed.ico";
@@ -463,9 +437,7 @@
 
 				$feed_title = db_escape_string($rss->get_title());
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: registering title: $feed_title");
-				}
+				_debug("registering title: $feed_title");
 
 				db_query("UPDATE ttrss_feeds SET
 					title = '$feed_title' WHERE id = '$feed'");
@@ -476,24 +448,17 @@
 					site_url = '$site_url' WHERE id = '$feed'");
 			}
 
-			if ($debug_enabled) {
-				_debug("update_rss_feed: loading filters & labels...");
-			}
+			_debug("loading filters & labels...");
 
 			$filters = load_filters($feed, $owner_uid);
 			$labels = get_all_labels($owner_uid);
 
-			if ($debug_enabled) {
-				//print_r($filters);
-				_debug("update_rss_feed: " . count($filters) . " filters loaded.");
-			}
+			_debug("" . count($filters) . " filters loaded.");
 
 			$items = $rss->get_items();
 
 			if (!is_array($items)) {
-				if ($debug_enabled) {
-					_debug("update_rss_feed: no articles found.");
-				}
+				_debug("no articles found.");
 
 				db_query("UPDATE ttrss_feeds
 					SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
@@ -503,7 +468,7 @@
 
 			if ($pubsub_state != 2 && PUBSUBHUBBUB_ENABLED) {
 
-				if ($debug_enabled) _debug("update_rss_feed: checking for PUSH hub...");
+				_debug("checking for PUSH hub...");
 
 				$feed_hub_url = false;
 
@@ -516,7 +481,7 @@
 					}
 				}
 
-				if ($debug_enabled) _debug("update_rss_feed: feed hub url: $feed_hub_url");
+				_debug("feed hub url: $feed_hub_url");
 
 				if ($feed_hub_url && function_exists('curl_init') &&
 					!ini_get("open_basedir")) {
@@ -530,17 +495,14 @@
 
 					$rc = $s->subscribe($fetch_url);
 
-					if ($debug_enabled)
-						_debug("update_rss_feed: feed hub url found, subscribe request sent.");
+					_debug("feed hub url found, subscribe request sent.");
 
 					db_query("UPDATE ttrss_feeds SET pubsub_state = 1
 						WHERE id = '$feed'");
 				}
 			}
 
-			if ($debug_enabled) {
-				_debug("update_rss_feed: processing articles...");
-			}
+			_debug("processing articles...");
 
 			foreach ($items as $item) {
 				if ($_REQUEST['xdebug'] == 3) {
@@ -557,9 +519,7 @@
 
 				$entry_guid_hashed = db_escape_string('SHA1:' . sha1($entry_guid));
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: guid $entry_guid / $entry_guid_hashed");
-				}
+				_debug("guid $entry_guid / $entry_guid_hashed");
 
 				$entry_timestamp = "";
 
@@ -574,18 +534,14 @@
 
 				$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: date $entry_timestamp [$entry_timestamp_fmt]");
-				}
+				_debug("date $entry_timestamp [$entry_timestamp_fmt]");
 
 				$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
 
 				$entry_link = rewrite_relative_url($site_url, $item->get_link());
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: title $entry_title");
-					_debug("update_rss_feed: link $entry_link");
-				}
+				_debug("title $entry_title");
+				_debug("link $entry_link");
 
 				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
 
@@ -593,7 +549,7 @@
 				if (!$entry_content) $entry_content = $item->get_description();
 
 				if ($_REQUEST["xdebug"] == 2) {
-					print "update_rss_feed: content: ";
+					print "content: ";
 					print $entry_content;
 					print "\n";
 				}
@@ -619,11 +575,9 @@
 					$num_comments = 0;
 				}
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: author $entry_author");
-					_debug("update_rss_feed: num_comments: $num_comments");
-					_debug("update_rss_feed: looking for tags [1]...");
-				}
+				_debug("author $entry_author");
+				_debug("num_comments: $num_comments");
+				_debug("looking for tags [1]...");
 
 				// parse <category> entries into tags
 
@@ -637,34 +591,19 @@
 					}
 				}
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: category tags:");
-					print_r($additional_tags);
-				}
-
-				if ($debug_enabled) {
-					_debug("update_rss_feed: looking for tags [2]...");
-				}
+				_debug("category tags:");
+				_debug("looking for tags [2]...");
 
 				$entry_tags = array_unique($additional_tags);
 
 				for ($i = 0; $i < count($entry_tags); $i++)
 					$entry_tags[$i] = mb_strtolower($entry_tags[$i], 'utf-8');
 
-				if ($debug_enabled) {
-					//_debug("update_rss_feed: unfiltered tags found:");
-					//print_r($entry_tags);
-				}
-
-				if ($debug_enabled) {
-					_debug("update_rss_feed: done collecting data.");
-				}
+				_debug("done collecting data.");
 
 				// TODO: less memory-hungry implementation
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: applying plugin filters..");
-				}
+				_debug("applying plugin filters..");
 
 				// FIXME not sure if owner_uid is a good idea here, we may have a base entry without user entry (?)
 				$result = db_query("SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries
@@ -705,9 +644,7 @@
 				$entry_content = $article["content"]; // escaped below
 
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: plugin data: $entry_plugin_data");
-				}
+				_debug("plugin data: $entry_plugin_data");
 
 				if ($cache_images && is_writable(CACHE_DIR . '/images'))
 					cache_images($entry_content, $site_url, $debug_enabled);
@@ -723,9 +660,7 @@
 
 				if (db_num_rows($result) == 0) {
 
-					if ($debug_enabled) {
-						_debug("update_rss_feed: base guid [$entry_guid] not found");
-					}
+					_debug("base guid [$entry_guid] not found");
 
 					// base post entry does not exist, create it
 
@@ -793,9 +728,7 @@
 
 				if (db_num_rows($result) == 1) {
 
-					if ($debug_enabled) {
-						_debug("update_rss_feed: base guid found, checking for user record");
-					}
+					_debug("base guid found, checking for user record");
 
 					// this will be used below in update handler
 					$orig_content_hash = db_fetch_result($result, 0, "content_hash");
@@ -832,7 +765,7 @@
 						$entry_tags);
 
 					if ($debug_enabled) {
-						_debug("update_rss_feed: article filters: ");
+						_debug("article filters: ");
 						if (count($article_filters) != 0) {
 							print_r($article_filters);
 						}
@@ -845,9 +778,7 @@
 
 					$score = calculate_article_score($article_filters);
 
-					if ($debug_enabled) {
-						_debug("update_rss_feed: initial score: $score");
-					}
+					_debug("initial score: $score");
 
 					$query = "SELECT ref_id, int_id FROM ttrss_user_entries WHERE
 							ref_id = '$ref_id' AND owner_uid = '$owner_uid'
@@ -860,9 +791,7 @@
 					// okay it doesn't exist - create user entry
 					if (db_num_rows($result) == 0) {
 
-						if ($debug_enabled) {
-							_debug("update_rss_feed: user record not found, creating...");
-						}
+						_debug("user record not found, creating...");
 
 						if ($score >= -500 && !find_article_filter($article_filters, 'catchup')) {
 							$unread = 'true';
@@ -896,9 +825,7 @@
 
 							$ngram_similar = db_fetch_result($result, 0, "similar");
 
-							if ($debug_enabled) {
-								_debug("update_rss_feed: N-gram similar results: $ngram_similar");
-							}
+							_debug("N-gram similar results: $ngram_similar");
 
 							if ($ngram_similar > 0) {
 								$unread = 'false';
@@ -936,17 +863,13 @@
 							$entry_int_id = db_fetch_result($result, 0, "int_id");
 						}
 					} else {
-						if ($debug_enabled) {
-							_debug("update_rss_feed: user record FOUND");
-						}
+						_debug("user record FOUND");
 
 						$entry_ref_id = db_fetch_result($result, 0, "ref_id");
 						$entry_int_id = db_fetch_result($result, 0, "int_id");
 					}
 
-					if ($debug_enabled) {
-						_debug("update_rss_feed: RID: $entry_ref_id, IID: $entry_int_id");
-					}
+					_debug("RID: $entry_ref_id, IID: $entry_int_id");
 
 					$post_needs_update = false;
 					$update_insignificant = false;
@@ -976,7 +899,7 @@
 					if ($post_needs_update) {
 
 						if (defined('DAEMON_EXTENDED_DEBUG')) {
-							_debug("update_rss_feed: post $entry_guid_hashed needs update...");
+							_debug("post $entry_guid_hashed needs update...");
 						}
 
 //						print "<!-- post $orig_title needs update : $post_needs_update -->";
@@ -1000,16 +923,12 @@
 
 				db_query("COMMIT");
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: assigning labels...");
-				}
+				_debug("assigning labels...");
 
 				assign_article_to_label_filters($entry_ref_id, $article_filters,
 					$owner_uid, $article_labels);
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: looking for enclosures...");
-				}
+				_debug("looking for enclosures...");
 
 				// enclosures
 
@@ -1026,7 +945,7 @@
 				}
 
 				if ($debug_enabled) {
-					_debug("update_rss_feed: article enclosures:");
+					_debug("article enclosures:");
 					print_r($enclosures);
 				}
 
@@ -1083,7 +1002,7 @@
 				$filtered_tags = array_unique($filtered_tags);
 
 				if ($debug_enabled) {
-					_debug("update_rss_feed: filtered article tags:");
+					_debug("filtered article tags:");
 					print_r($filtered_tags);
 				}
 
@@ -1128,9 +1047,7 @@
 				}
 
 				if (get_pref("AUTO_ASSIGN_LABELS", $owner_uid, false)) {
-					if ($debug_enabled) {
-						_debug("update_rss_feed: auto-assigning labels...");
-					}
+					_debug("auto-assigning labels...");
 
 					foreach ($labels as $label) {
 						$caption = preg_quote($label["caption"]);
@@ -1143,21 +1060,15 @@
 					}
 				}
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: article processed");
-				}
+				_debug("article processed");
 			}
 
 			if (!$last_updated) {
-				if ($debug_enabled) {
-					_debug("update_rss_feed: new feed, catching it up...");
-				}
+				_debug("new feed, catching it up...");
 				catchup_feed($feed, false, $owner_uid);
 			}
 
-			if ($debug_enabled) {
-				_debug("purging feed...");
-			}
+			_debug("purging feed...");
 
 			purge_feed($feed, 0, $debug_enabled);
 
@@ -1170,9 +1081,7 @@
 
 			$error_msg = db_escape_string(mb_substr($rss->error(), 0, 245));
 
-			if ($debug_enabled) {
-				_debug("update_rss_feed: error fetching feed: $error_msg");
-			}
+			_debug("error fetching feed: $error_msg");
 
 			db_query(
 				"UPDATE ttrss_feeds SET last_error = '$error_msg',
@@ -1181,10 +1090,9 @@
 
 		unset($rss);
 
-		if ($debug_enabled) {
-			_debug("update_rss_feed: done");
-		}
+		_debug("done");
 
+		_debug_enable($prev_debug_enabled);
 	}
 
 	function cache_images($html, $site_url, $debug) {
-- 
cgit v1.2.3-54-g00ecf


From 68cccafcad6b59eb9088793f5d3a506de03aab6b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 13:42:40 +0400
Subject: remove debug_enabled global

---
 include/functions.php |  19 +-------
 include/rssfuncs.php  | 130 +++++++++++++++++++++++++-------------------------
 2 files changed, 66 insertions(+), 83 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 004f4db2f..88484cadd 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -129,26 +129,20 @@
 	$utc_tz = new DateTimeZone('UTC');
 	$schema_version = false;
 
-	global $_debug_enabled;
-	$_debug_enabled = true;
-
 	/**
 	 * Print a timestamped debug message.
 	 *
 	 * @param string $msg The debug message.
 	 * @return void
 	 */
-	function _debug($msg) {
-		global $_debug_enabled;
-
-		if (!$_debug_enabled) return;
+	function _debug($msg, $show = true) {
 
 		$ts = strftime("%H:%M:%S", time());
 		if (function_exists('posix_getpid')) {
 			$ts = "$ts/" . posix_getpid();
 		}
 
-		if (!(defined('QUIET') && QUIET)) {
+		if ($show && !(defined('QUIET') && QUIET)) {
 			print "[$ts] $msg\n";
 		}
 
@@ -163,15 +157,6 @@
 
 	} // function _debug
 
-	function _debug_enable($enabled) {
-		global $_debug_enabled;
-
-		$old = $_debug_enabled;
-		$_debug_enabled = $enabled;
-
-		return $old;
-	}
-
 	/**
 	 * Purge a feed old posts.
 	 *
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 2f9ba4260..6ccf520af 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -201,9 +201,7 @@
 
 		$debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
 
-		$prev_debug_enabled = _debug_enable($debug_enabled);
-
-		_debug("start");
+		_debug("start", $debug_enabled);
 
 		$result = db_query("SELECT id,update_interval,auth_login,
 			feed_url,auth_pass,cache_images,last_updated,
@@ -212,7 +210,7 @@
 			FROM ttrss_feeds WHERE id = '$feed'");
 
 		if (db_num_rows($result) == 0) {
-			_debug("feed $feed NOT FOUND/SKIPPED");
+			_debug("feed $feed NOT FOUND/SKIPPED", $debug_enabled);
 			return false;
 		}
 
@@ -250,8 +248,8 @@
 		$cache_age = ($no_cache || is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ?
 			30 : get_feed_update_interval($feed) * 60;
 
-		_debug("cache filename: $cache_filename exists: " . file_exists($cache_filename));
-		_debug("cache age: $cache_age; no cache: $no_cache");
+		_debug("cache filename: $cache_filename exists: " . file_exists($cache_filename), $debug_enabled);
+		_debug("cache age: $cache_age; no cache: $no_cache", $debug_enabled);
 
 		$cached_feed_data_hash = false;
 
@@ -267,7 +265,7 @@
 			!$auth_login && !$auth_pass &&
 			filemtime($cache_filename) > time() - $cache_age) {
 
-				_debug("using local cache.");
+				_debug("using local cache.", $debug_enabled);
 
 				if ($cache_timestamp > $last_updated_timestamp) {
 					@$rss_data = file_get_contents($cache_filename);
@@ -277,7 +275,7 @@
 						@$rss = unserialize($rss_data);
 					}
 				} else if (!$force_refetch) {
-					_debug("local cache valid and older than last_updated, nothing to do.");
+					_debug("local cache valid and older than last_updated, nothing to do.", $debug_enabled);
 					return;
 				}
 		}
@@ -285,7 +283,7 @@
 		if (!$rss) {
 
 			if (!$feed_data) {
-				_debug("fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)");
+				_debug("fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)", $debug_enabled);
 
 				$feed_data = fetch_file_contents($fetch_url, false,
 					$auth_login, $auth_pass, false,
@@ -302,21 +300,23 @@
 
 				$feed_data = trim($feed_data);
 
-				_debug("fetch done.");
+				_debug("fetch done.", $debug_enabled);
 
-				$error = verify_feed_xml($feed_data);
+				if ($feed_data) {
+					$error = verify_feed_xml($feed_data);
 
-				if ($error) {
-					_debug("error verifying XML, code: " . $error->code);
+					if ($error) {
+						_debug("error verifying XML, code: " . $error->code, $debug_enabled);
 
-					if ($error->code == 26) {
-						_debug("got error 26, trying to decode entities...");
+						if ($error->code == 26) {
+							_debug("got error 26, trying to decode entities...", $debug_enabled);
 
-						$feed_data = html_entity_decode($feed_data, ENT_COMPAT, 'UTF-8');
+							$feed_data = html_entity_decode($feed_data, ENT_COMPAT, 'UTF-8');
 
-						$error = verify_feed_xml($feed_data);
+							$error = verify_feed_xml($feed_data);
 
-						if ($error) $feed_data = '';
+							if ($error) $feed_data = '';
+						}
 					}
 				}
 			}
@@ -325,7 +325,7 @@
 				global $fetch_last_error;
 				global $fetch_last_error_code;
 
-				_debug("unable to fetch: $fetch_last_error [$fetch_last_error_code]");
+				_debug("unable to fetch: $fetch_last_error [$fetch_last_error_code]", $debug_enabled);
 
 				$error_escaped = '';
 
@@ -333,7 +333,7 @@
 				if ($fetch_last_error_code != 304) {
 					$error_escaped = db_escape_string($fetch_last_error);
 				} else {
-					_debug("source claims data not modified, nothing to do.");
+					_debug("source claims data not modified, nothing to do.", $debug_enabled);
 				}
 
 				db_query(
@@ -345,7 +345,7 @@
 		}
 
 		$pluginhost = new PluginHost();
-		$pluginhost->set_debug($debug_enabled);
+		$pluginhost->set_debug($debug_enabled, $debug_enabled);
 		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
 		$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
@@ -381,7 +381,7 @@
 				$new_rss_hash = sha1($rss_data);
 
 				if ($new_rss_hash != $rss_hash) {
-					_debug("saving $cache_filename");
+					_debug("saving $cache_filename", $debug_enabled);
 					@file_put_contents($cache_filename, serialize($rss));
 				}
 			}
@@ -389,7 +389,7 @@
 			// We use local pluginhost here because we need to load different per-user feed plugins
 			$pluginhost->run_hooks(PluginHost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss);
 
-			_debug("processing feed data...");
+			_debug("processing feed data...", $debug_enabled);
 
 //			db_query("BEGIN");
 
@@ -414,7 +414,7 @@
 			$site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
 
 			if ($favicon_needs_check || $force_refetch) {
-				_debug("checking favicon...");
+				_debug("checking favicon...", $debug_enabled);
 
 				check_feed_favicon($site_url, $feed, $link);
 				$favicon_file = ICONS_DIR . "/$feed.ico";
@@ -437,7 +437,7 @@
 
 				$feed_title = db_escape_string($rss->get_title());
 
-				_debug("registering title: $feed_title");
+				_debug("registering title: $feed_title", $debug_enabled);
 
 				db_query("UPDATE ttrss_feeds SET
 					title = '$feed_title' WHERE id = '$feed'");
@@ -448,17 +448,17 @@
 					site_url = '$site_url' WHERE id = '$feed'");
 			}
 
-			_debug("loading filters & labels...");
+			_debug("loading filters & labels...", $debug_enabled);
 
 			$filters = load_filters($feed, $owner_uid);
 			$labels = get_all_labels($owner_uid);
 
-			_debug("" . count($filters) . " filters loaded.");
+			_debug("" . count($filters) . " filters loaded.", $debug_enabled);
 
 			$items = $rss->get_items();
 
 			if (!is_array($items)) {
-				_debug("no articles found.");
+				_debug("no articles found.", $debug_enabled);
 
 				db_query("UPDATE ttrss_feeds
 					SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
@@ -468,7 +468,7 @@
 
 			if ($pubsub_state != 2 && PUBSUBHUBBUB_ENABLED) {
 
-				_debug("checking for PUSH hub...");
+				_debug("checking for PUSH hub...", $debug_enabled);
 
 				$feed_hub_url = false;
 
@@ -481,7 +481,7 @@
 					}
 				}
 
-				_debug("feed hub url: $feed_hub_url");
+				_debug("feed hub url: $feed_hub_url", $debug_enabled);
 
 				if ($feed_hub_url && function_exists('curl_init') &&
 					!ini_get("open_basedir")) {
@@ -495,14 +495,14 @@
 
 					$rc = $s->subscribe($fetch_url);
 
-					_debug("feed hub url found, subscribe request sent.");
+					_debug("feed hub url found, subscribe request sent.", $debug_enabled);
 
 					db_query("UPDATE ttrss_feeds SET pubsub_state = 1
 						WHERE id = '$feed'");
 				}
 			}
 
-			_debug("processing articles...");
+			_debug("processing articles...", $debug_enabled);
 
 			foreach ($items as $item) {
 				if ($_REQUEST['xdebug'] == 3) {
@@ -519,7 +519,7 @@
 
 				$entry_guid_hashed = db_escape_string('SHA1:' . sha1($entry_guid));
 
-				_debug("guid $entry_guid / $entry_guid_hashed");
+				_debug("guid $entry_guid / $entry_guid_hashed", $debug_enabled);
 
 				$entry_timestamp = "";
 
@@ -534,14 +534,14 @@
 
 				$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
 
-				_debug("date $entry_timestamp [$entry_timestamp_fmt]");
+				_debug("date $entry_timestamp [$entry_timestamp_fmt]", $debug_enabled);
 
 				$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
 
 				$entry_link = rewrite_relative_url($site_url, $item->get_link());
 
-				_debug("title $entry_title");
-				_debug("link $entry_link");
+				_debug("title $entry_title", $debug_enabled);
+				_debug("link $entry_link", $debug_enabled);
 
 				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
 
@@ -575,9 +575,9 @@
 					$num_comments = 0;
 				}
 
-				_debug("author $entry_author");
-				_debug("num_comments: $num_comments");
-				_debug("looking for tags [1]...");
+				_debug("author $entry_author", $debug_enabled);
+				_debug("num_comments: $num_comments", $debug_enabled);
+				_debug("looking for tags [1]...", $debug_enabled);
 
 				// parse <category> entries into tags
 
@@ -591,19 +591,19 @@
 					}
 				}
 
-				_debug("category tags:");
-				_debug("looking for tags [2]...");
+				_debug("category tags:", $debug_enabled);
+				_debug("looking for tags [2]...", $debug_enabled);
 
 				$entry_tags = array_unique($additional_tags);
 
 				for ($i = 0; $i < count($entry_tags); $i++)
 					$entry_tags[$i] = mb_strtolower($entry_tags[$i], 'utf-8');
 
-				_debug("done collecting data.");
+				_debug("done collecting data.", $debug_enabled);
 
 				// TODO: less memory-hungry implementation
 
-				_debug("applying plugin filters..");
+				_debug("applying plugin filters..", $debug_enabled);
 
 				// FIXME not sure if owner_uid is a good idea here, we may have a base entry without user entry (?)
 				$result = db_query("SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries
@@ -644,7 +644,7 @@
 				$entry_content = $article["content"]; // escaped below
 
 
-				_debug("plugin data: $entry_plugin_data");
+				_debug("plugin data: $entry_plugin_data", $debug_enabled);
 
 				if ($cache_images && is_writable(CACHE_DIR . '/images'))
 					cache_images($entry_content, $site_url, $debug_enabled);
@@ -660,7 +660,7 @@
 
 				if (db_num_rows($result) == 0) {
 
-					_debug("base guid [$entry_guid] not found");
+					_debug("base guid [$entry_guid] not found", $debug_enabled);
 
 					// base post entry does not exist, create it
 
@@ -728,7 +728,7 @@
 
 				if (db_num_rows($result) == 1) {
 
-					_debug("base guid found, checking for user record");
+					_debug("base guid found, checking for user record", $debug_enabled);
 
 					// this will be used below in update handler
 					$orig_content_hash = db_fetch_result($result, 0, "content_hash");
@@ -743,7 +743,7 @@
 
 					/* $stored_guid = db_fetch_result($result, 0, "guid");
 					if ($stored_guid != $entry_guid_hashed) {
-						if ($debug_enabled) _debug("upgrading compat guid to hashed one");
+						if ($debug_enabled) _debug("upgrading compat guid to hashed one", $debug_enabled);
 
 						db_query("UPDATE ttrss_entries SET guid = '$entry_guid_hashed' WHERE
 							id = '$ref_id'");
@@ -765,7 +765,7 @@
 						$entry_tags);
 
 					if ($debug_enabled) {
-						_debug("article filters: ");
+						_debug("article filters: ", $debug_enabled);
 						if (count($article_filters) != 0) {
 							print_r($article_filters);
 						}
@@ -778,7 +778,7 @@
 
 					$score = calculate_article_score($article_filters);
 
-					_debug("initial score: $score");
+					_debug("initial score: $score", $debug_enabled);
 
 					$query = "SELECT ref_id, int_id FROM ttrss_user_entries WHERE
 							ref_id = '$ref_id' AND owner_uid = '$owner_uid'
@@ -791,7 +791,7 @@
 					// okay it doesn't exist - create user entry
 					if (db_num_rows($result) == 0) {
 
-						_debug("user record not found, creating...");
+						_debug("user record not found, creating...", $debug_enabled);
 
 						if ($score >= -500 && !find_article_filter($article_filters, 'catchup')) {
 							$unread = 'true';
@@ -825,7 +825,7 @@
 
 							$ngram_similar = db_fetch_result($result, 0, "similar");
 
-							_debug("N-gram similar results: $ngram_similar");
+							_debug("N-gram similar results: $ngram_similar", $debug_enabled);
 
 							if ($ngram_similar > 0) {
 								$unread = 'false';
@@ -863,13 +863,13 @@
 							$entry_int_id = db_fetch_result($result, 0, "int_id");
 						}
 					} else {
-						_debug("user record FOUND");
+						_debug("user record FOUND", $debug_enabled);
 
 						$entry_ref_id = db_fetch_result($result, 0, "ref_id");
 						$entry_int_id = db_fetch_result($result, 0, "int_id");
 					}
 
-					_debug("RID: $entry_ref_id, IID: $entry_int_id");
+					_debug("RID: $entry_ref_id, IID: $entry_int_id", $debug_enabled);
 
 					$post_needs_update = false;
 					$update_insignificant = false;
@@ -899,7 +899,7 @@
 					if ($post_needs_update) {
 
 						if (defined('DAEMON_EXTENDED_DEBUG')) {
-							_debug("post $entry_guid_hashed needs update...");
+							_debug("post $entry_guid_hashed needs update...", $debug_enabled);
 						}
 
 //						print "<!-- post $orig_title needs update : $post_needs_update -->";
@@ -923,12 +923,12 @@
 
 				db_query("COMMIT");
 
-				_debug("assigning labels...");
+				_debug("assigning labels...", $debug_enabled);
 
 				assign_article_to_label_filters($entry_ref_id, $article_filters,
 					$owner_uid, $article_labels);
 
-				_debug("looking for enclosures...");
+				_debug("looking for enclosures...", $debug_enabled);
 
 				// enclosures
 
@@ -945,7 +945,7 @@
 				}
 
 				if ($debug_enabled) {
-					_debug("article enclosures:");
+					_debug("article enclosures:", $debug_enabled);
 					print_r($enclosures);
 				}
 
@@ -1002,7 +1002,7 @@
 				$filtered_tags = array_unique($filtered_tags);
 
 				if ($debug_enabled) {
-					_debug("filtered article tags:");
+					_debug("filtered article tags:", $debug_enabled);
 					print_r($filtered_tags);
 				}
 
@@ -1047,7 +1047,7 @@
 				}
 
 				if (get_pref("AUTO_ASSIGN_LABELS", $owner_uid, false)) {
-					_debug("auto-assigning labels...");
+					_debug("auto-assigning labels...", $debug_enabled);
 
 					foreach ($labels as $label) {
 						$caption = preg_quote($label["caption"]);
@@ -1060,15 +1060,15 @@
 					}
 				}
 
-				_debug("article processed");
+				_debug("article processed", $debug_enabled);
 			}
 
 			if (!$last_updated) {
-				_debug("new feed, catching it up...");
+				_debug("new feed, catching it up...", $debug_enabled);
 				catchup_feed($feed, false, $owner_uid);
 			}
 
-			_debug("purging feed...");
+			_debug("purging feed...", $debug_enabled);
 
 			purge_feed($feed, 0, $debug_enabled);
 
@@ -1081,7 +1081,7 @@
 
 			$error_msg = db_escape_string(mb_substr($rss->error(), 0, 245));
 
-			_debug("error fetching feed: $error_msg");
+			_debug("error fetching feed: $error_msg", $debug_enabled);
 
 			db_query(
 				"UPDATE ttrss_feeds SET last_error = '$error_msg',
@@ -1090,9 +1090,7 @@
 
 		unset($rss);
 
-		_debug("done");
-
-		_debug_enable($prev_debug_enabled);
+		_debug("done", $debug_enabled);
 	}
 
 	function cache_images($html, $site_url, $debug) {
-- 
cgit v1.2.3-54-g00ecf


From 01311d86fea8788c596d46e72073dc3c7e610b76 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 18:08:24 +0400
Subject: fetch: support if-modified-since without CURL

---
 include/functions.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 88484cadd..615f0a9b7 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -392,7 +392,17 @@
 				}
 			}
 
-			$data = @file_get_contents($url);
+			if (!$post_query && $timestamp) {
+				$context = stream_context_create(array(
+					'http' => array(
+						'method' => 'GET',
+						'header' => "If-Modified-Since: ".gmdate("D, d M Y H:i:s \\G\\M\\T\r\n", $timestamp)
+					)));
+			} else {
+				$context = NULL;
+			}
+
+			$data = @file_get_contents($url, false, $context);
 
 			$fetch_last_content_type = false;  // reset if no type was sent from server
 			if (is_array($http_response_header)) {
@@ -402,6 +412,10 @@
 						// don't abort here b/c there might be more than one
 						// e.g. if we were being redirected -- last one is the right one
 					}
+
+					if (substr(strtolower($h), 0, 7) == 'http/1.') {
+						$fetch_last_error_code = (int) substr($h, 9, 3);
+					}
 				}
 			}
 
-- 
cgit v1.2.3-54-g00ecf


From 6122c449abae6d6dfa5372580242b4abdf4d7a97 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 18:13:21 +0400
Subject: correctly report fetch error

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

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 615f0a9b7..e861193c2 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -402,6 +402,8 @@
 				$context = NULL;
 			}
 
+			$old_error = error_get_last();
+
 			$data = @file_get_contents($url, false, $context);
 
 			$fetch_last_content_type = false;  // reset if no type was sent from server
@@ -419,9 +421,14 @@
 				}
 			}
 
-			if (!$data && function_exists('error_get_last')) {
+			if (!$data) {
 				$error = error_get_last();
-				$fetch_last_error = $error["message"];
+
+				if ($error['message'] != $old_error['message']) {
+					$fetch_last_error = $error["message"];
+				} else {
+					$fetch_last_error = "HTTP Code: $fetch_last_error_code";
+				}
 			}
 			return $data;
 		}
-- 
cgit v1.2.3-54-g00ecf


From 9ce600c8018b6cfe7711f28fa46247f62f424379 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 20 Apr 2013 01:38:06 +0400
Subject: disable on subscription feed XML validation for the time being

---
 include/functions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index e861193c2..8a414aec2 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1611,9 +1611,9 @@
 			$url = key($feedUrls);
 		}
 
-		libxml_use_internal_errors(true);
+		/* libxml_use_internal_errors(true);
 		$doc = new DOMDocument();
-		$doc->loadXML(html_entity_decode($contents));
+		$doc->loadXML($contents);
 		$error = libxml_get_last_error();
 		libxml_clear_errors();
 
@@ -1621,7 +1621,7 @@
 			$error_message = format_libxml_error($error);
 
 			return array("code" => 6, "message" => $error_message);
-		}
+		} */
 
 		if ($cat_id == "0" || !$cat_id) {
 			$cat_qpart = "NULL";
-- 
cgit v1.2.3-54-g00ecf


From 37ddf5b7e76114239085badfc0b1e5f94ca32480 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 24 Apr 2013 10:45:44 +0400
Subject: fetch: check if http_response_header is set

---
 include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 8a414aec2..10a3504f2 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -407,7 +407,7 @@
 			$data = @file_get_contents($url, false, $context);
 
 			$fetch_last_content_type = false;  // reset if no type was sent from server
-			if (is_array($http_response_header)) {
+			if (isset($http_response_header) && is_array($http_response_header)) {
 				foreach ($http_response_header as $h) {
 					if (substr(strtolower($h), 0, 13) == 'content-type:') {
 						$fetch_last_content_type = substr($h, 14);
-- 
cgit v1.2.3-54-g00ecf


From 81c206634581595680ba784494f619ea977785f3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 24 Apr 2013 13:21:40 +0400
Subject: updating: do not use cache timestamp if it is unusable for current
 feed; sort chronologically instead of random

---
 include/functions.php | 2 +-
 include/rssfuncs.php  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 10a3504f2..72b20cd06 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -320,7 +320,7 @@
 				$ch = curl_init($url);
 			}
 
-			if ($timestamp) {
+			if ($timestamp && !$post_query) {
 				curl_setopt($ch, CURLOPT_HTTPHEADER,
 					array("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $timestamp)));
 			}
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 870d77203..e9b9c7142 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -113,10 +113,8 @@
 		$query_limit = "";
 		if($limit) $query_limit = sprintf("LIMIT %d", $limit);
 
-		$random_qpart = sql_random_function();
-
 		// We search for feed needing update.
-		$result = db_query("SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart
+		$result = db_query("SELECT DISTINCT ttrss_feeds.feed_url
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -125,7 +123,7 @@
 				AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
 				$login_thresh_qpart $update_limit_qpart
 				$updstart_thresh_qpart
-			ORDER BY $random_qpart $query_limit");
+			ORDER BY last_updated $query_limit");
 
 		if($debug) _debug(sprintf("Scheduled %d feeds to update...", db_num_rows($result)));
 
@@ -278,6 +276,9 @@
 					_debug("local cache valid and older than last_updated, nothing to do.", $debug_enabled);
 					return;
 				}
+		} else {
+			_debug("local cache will not be used for this feed", $debug_enabled);
+			$cache_timestamp = 0;
 		}
 
 		if (!$rss) {
-- 
cgit v1.2.3-54-g00ecf


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 +--------
 include/functions.php      |  2 +-
 include/rssfuncs.php       | 19 ++++++++++++++-----
 update.php                 | 21 ++-------------------
 update_daemon2.php         | 16 +++-------------
 6 files changed, 25 insertions(+), 46 deletions(-)

(limited to 'include/functions.php')

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);
 
diff --git a/include/functions.php b/include/functions.php
index 72b20cd06..a41d3a950 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -922,7 +922,7 @@
 	function get_schema_version($nocache = false) {
 		global $schema_version;
 
-		if (!$schema_version) {
+		if (!$schema_version && !$nocache) {
 			$result = db_query("SELECT schema_version FROM ttrss_version");
 			$version = db_fetch_result($result, 0, "schema_version");
 			$schema_version = $version;
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 48638f57e..a64d60e1e 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1,7 +1,7 @@
 <?php
 	define_default('DAEMON_UPDATE_LOGIN_LIMIT', 30);
 	define_default('DAEMON_FEED_LIMIT', 500);
-	define_default('DAEMON_SLEEP_INTERVAL', 60);
+	define_default('DAEMON_SLEEP_INTERVAL', 120);
 
 	function update_feedbrowser_cache() {
 
@@ -150,10 +150,6 @@
 				WHERE feed_url IN (%s)", implode(',', $feeds_quoted)));
 		}
 
-		expire_cached_files($debug);
-		expire_lock_files($debug);
-		expire_error_log($debug);
-
 		$nf = 0;
 
 		// For each feed, we call the feed update function.
@@ -1374,4 +1370,17 @@
 		return $error;
 	}
 
+	function housekeeping_common($debug) {
+		expire_cached_files($debug);
+		expire_lock_files($debug);
+		expire_error_log($debug);
+
+		$count = update_feedbrowser_cache();
+		_debug("Feedbrowser updated, $count feeds processed.");
+
+		purge_orphans( true);
+		$rc = cleanup_tags( 14, 50000);
+
+		_debug("Cleaned $rc cached tags.");
+	}
 ?>
diff --git a/update.php b/update.php
index 0853f3dd5..d4160c7ba 100755
--- a/update.php
+++ b/update.php
@@ -148,18 +148,8 @@
 	}
 
 	if (isset($options["feeds"])) {
-		// Update all feeds needing a update.
 		update_daemon_common();
-
-		// Update feedbrowser
-		$count = update_feedbrowser_cache();
-		_debug("Feedbrowser updated, $count feeds processed.");
-
-		// Purge orphans and cleanup tags
-		purge_orphans( true);
-
-		$rc = cleanup_tags( 14, 50000);
-		_debug("Cleaned $rc cached tags.");
+		housekeeping_common(true);
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 	}
@@ -185,15 +175,8 @@
 		}
 
 		update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
+		housekeeping_common(true);
 
-		$count = update_feedbrowser_cache();
-		_debug("Feedbrowser updated, $count feeds processed.");
-
-		purge_orphans( true);
-
-		$rc = cleanup_tags( 14, 50000);
-
-		_debug("Cleaned $rc cached tags.");
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 	}
 
diff --git a/update_daemon2.php b/update_daemon2.php
index 7692eb930..d5b6a45e3 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -170,14 +170,15 @@
 			"Maybe another daemon is already running.\n");
 	}
 
-	init_plugins();
-
 	$schema_version = get_schema_version();
 
 	if ($schema_version != SCHEMA_VERSION) {
 		die("Schema version is wrong, please upgrade the database.\n");
 	}
 
+	// Protip: children close shared database handle when terminating, it's a bad idea to
+	// do database stuff on main process from now on.
+
 	while (true) {
 
 		// Since sleep is interupted by SIGCHLD, we need another way to
@@ -190,17 +191,6 @@
 		}
 
 		if ($last_checkpoint + $spawn_interval < time()) {
-
-			/* Check if schema version changed */
-
-			$test_schema_version = get_schema_version();
-
-			if ($test_schema_version != $schema_version) {
-				echo "Expected schema version: $schema_version, got: $test_schema_version\n";
-				echo "Schema version changed while we were running, bailing out\n";
-				exit(100);
-			}
-
 			check_ctimes();
 			reap_children();
 
-- 
cgit v1.2.3-54-g00ecf


From 3472c4c5696cfa868b16d81c937605258acd2125 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 16:57:24 +0400
Subject: use static version for session checking, show latest changeset for
 git version instead of head date

---
 include/functions.php | 2 +-
 include/sessions.php  | 2 +-
 include/version.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index a41d3a950..39021e9d0 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -659,7 +659,7 @@
 				@session_start();
 
 				$_SESSION["uid"] = $user_id;
-				$_SESSION["version"] = VERSION;
+				$_SESSION["version"] = VERSION_STATIC;
 
 				$result = db_query("SELECT login,access_level,pwd_hash FROM ttrss_users
 					WHERE id = '$user_id'");
diff --git a/include/sessions.php b/include/sessions.php
index c4876489f..423ef0eda 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -39,7 +39,7 @@
 	function validate_session() {
 		if (SINGLE_USER_MODE) return true;
 
-		if (VERSION != $_SESSION["version"]) return false;
+		if (VERSION_STATIC != $_SESSION["version"]) return false;
 
 		$check_ip = $_SESSION['ip_address'];
 
diff --git a/include/version.php b/include/version.php
index 4d088a2bb..0e583f9ec 100644
--- a/include/version.php
+++ b/include/version.php
@@ -7,7 +7,7 @@
 
 		if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/ORIG_HEAD")) {
 
-			$suffix = date("Ymd", filemtime("$root_dir/.git/ORIG_HEAD"));
+			$suffix = substr(trim(file_get_contents("$root_dir/.git/ORIG_HEAD")), 0, 7);
 
 			return VERSION_STATIC . ".$suffix";
 		} else {
-- 
cgit v1.2.3-54-g00ecf


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 +++++++---
 include/functions.php |  5 +++--
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'include/functions.php')

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);
 
diff --git a/include/functions.php b/include/functions.php
index 39021e9d0..d42e111f2 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2535,12 +2535,13 @@
 					$feed_title = getCategoryTitle($feed);
 				} else {
 					if (is_numeric($feed) && $feed > 0) {
-						$result = db_query("SELECT title,site_url,last_error
+						$result = db_query("SELECT title,site_url,last_error,last_updated
 							FROM ttrss_feeds WHERE id = '$feed' AND owner_uid = $owner_uid");
 
 						$feed_title = db_fetch_result($result, 0, "title");
 						$feed_site_url = db_fetch_result($result, 0, "site_url");
 						$last_error = db_fetch_result($result, 0, "last_error");
+						$last_updated = db_fetch_result($result, 0, "last_updated");
 					} else {
 						$feed_title = getFeedTitle($feed);
 					}
@@ -2688,7 +2689,7 @@
 				$result = db_query($select_qpart . $from_qpart . $where_qpart);
 			}
 
-			return array($result, $feed_title, $feed_site_url, $last_error);
+			return array($result, $feed_title, $feed_site_url, $last_error, $last_updated);
 
 	}
 
-- 
cgit v1.2.3-54-g00ecf


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 ++-
 include/functions.php |  2 ++
 include/rssfuncs.php  | 14 ++++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'include/functions.php')

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;
 
diff --git a/include/functions.php b/include/functions.php
index d42e111f2..8d09abf7b 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -855,6 +855,8 @@
 		global $utc_tz;
 		global $tz_offset;
 
+		$timestamp = substr($timestamp, 0, 19);
+
 		# We store date in UTC internally
 		$dt = new DateTime($timestamp, $utc_tz);
 
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index dbe76d2d3..0cd41dc05 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -202,7 +202,9 @@
 		$result = db_query("SELECT id,update_interval,auth_login,
 			feed_url,auth_pass,cache_images,last_updated,
 			mark_unread_on_update, owner_uid,
-			pubsub_state, auth_pass_encrypted
+			pubsub_state, auth_pass_encrypted,
+			(SELECT max(date_entered) FROM
+				ttrss_entries, ttrss_user_entries where ref_id = id AND feed_id = '$feed') AS last_article_timestamp
 			FROM ttrss_feeds WHERE id = '$feed'");
 
 		if (db_num_rows($result) == 0) {
@@ -211,6 +213,7 @@
 		}
 
 		$last_updated = db_fetch_result($result, 0, "last_updated");
+		$last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp"));
 		$owner_uid = db_fetch_result($result, 0, "owner_uid");
 		$mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result,
 			0, "mark_unread_on_update"));
@@ -251,7 +254,6 @@
 		$rss = false;
 		$rss_hash = false;
 		$cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0;
-		$last_updated_timestamp = strtotime($last_updated);
 
 		$force_refetch = isset($_REQUEST["force_refetch"]);
 
@@ -262,7 +264,7 @@
 
 				_debug("using local cache.", $debug_enabled);
 
-				if ($cache_timestamp > $last_updated_timestamp) {
+				if ($cache_timestamp > $last_article_timestamp) {
 					@$rss_data = file_get_contents($cache_filename);
 
 					if ($rss_data) {
@@ -275,18 +277,18 @@
 				}
 		} else {
 			_debug("local cache will not be used for this feed", $debug_enabled);
-			$cache_timestamp = 0;
 		}
 
 		if (!$rss) {
 
 			if (!$feed_data) {
-				_debug("fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)", $debug_enabled);
+				_debug("fetching [$fetch_url]...", $debug_enabled);
+				_debug("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $last_article_timestamp), $debug_enabled);
 
 				$feed_data = fetch_file_contents($fetch_url, false,
 					$auth_login, $auth_pass, false,
 					$no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
-					$force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp));
+					$force_refetch ? 0 : $last_article_timestamp);
 
 				global $fetch_curl_used;
 
-- 
cgit v1.2.3-54-g00ecf


From dcd7ecaa0fb196eb8cd0af431a866dbac81b460c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 26 Apr 2013 00:02:13 +0400
Subject: strip_harmful_tags: use XPath to actually get all tags to work on

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

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 8d09abf7b..8ecdb71e5 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2801,7 +2801,8 @@
 	}
 
 	function strip_harmful_tags($doc, $allowed_elements, $disallowed_attributes) {
-		$entries = $doc->getElementsByTagName("*");
+		$xpath = new DOMXPath($doc);
+		$entries = $xpath->query('//*');
 
 		foreach ($entries as $entry) {
 			if (!in_array($entry->nodeName, $allowed_elements)) {
-- 
cgit v1.2.3-54-g00ecf


From 5ddef5ba238ad8bdfc23344b3bb3297067eb1747 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 26 Apr 2013 08:50:22 +0400
Subject: do not store tz offset in global, store timezone object instead

---
 include/functions.php | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 8ecdb71e5..b54187e18 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -125,8 +125,6 @@
 
 	require_once 'lib/pubsubhubbub/publisher.php';
 
-	$tz_offset = -1;
-	$utc_tz = new DateTimeZone('UTC');
 	$schema_version = false;
 
 	/**
@@ -853,26 +851,25 @@
 		if (!$timestamp) $timestamp = '1970-01-01 0:00';
 
 		global $utc_tz;
-		global $tz_offset;
+		global $user_tz;
+
+		if (!$utc_tz) $utc_tz = new DateTimeZone('UTC');
 
 		$timestamp = substr($timestamp, 0, 19);
 
 		# We store date in UTC internally
 		$dt = new DateTime($timestamp, $utc_tz);
 
-		if ($tz_offset == -1) {
-
-			$user_tz_string = get_pref('USER_TIMEZONE', $owner_uid);
-
-			try {
-				$user_tz = new DateTimeZone($user_tz_string);
-			} catch (Exception $e) {
-				$user_tz = $utc_tz;
-			}
+		$user_tz_string = get_pref('USER_TIMEZONE', $owner_uid);
 
-			$tz_offset = $user_tz->getOffset($dt);
+		try {
+			if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
+		} catch (Exception $e) {
+			$user_tz = $utc_tz;
 		}
 
+		$tz_offset = $user_tz->getOffset($dt);
+
 		$user_timestamp = $dt->format('U') + $tz_offset;
 
 		if (!$no_smart_dt) {
-- 
cgit v1.2.3-54-g00ecf


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 +
 include/functions.php | 17 +++++++++++------
 js/prefs.js           |  5 ++++-
 js/tt-rss.js          |  2 ++
 lib/timezones.txt     |  1 +
 5 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'include/functions.php')

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();
 
diff --git a/include/functions.php b/include/functions.php
index b54187e18..4272c649d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -862,13 +862,18 @@
 
 		$user_tz_string = get_pref('USER_TIMEZONE', $owner_uid);
 
-		try {
-			if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
-		} catch (Exception $e) {
-			$user_tz = $utc_tz;
-		}
+		if ($user_tz_string != 'Automatic') {
 
-		$tz_offset = $user_tz->getOffset($dt);
+			try {
+				if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
+			} catch (Exception $e) {
+				$user_tz = $utc_tz;
+			}
+
+			$tz_offset = $user_tz->getOffset($dt);
+		} else {
+			$tz_offset = (int) $_SESSION["clientTzOffset"];
+		}
 
 		$user_timestamp = $dt->format('U') + $tz_offset;
 
diff --git a/js/prefs.js b/js/prefs.js
index 8612b70fb..431a1fe84 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -962,8 +962,11 @@ function init() {
 		dojo.addOnLoad(function() {
 			loading_set_progress(50);
 
+			var clientTzOffset = new Date().getTimezoneOffset() * 60;
+
 			new Ajax.Request("backend.php", {
-				parameters: {op: "rpc", method: "sanityCheck"},
+				parameters: {op: "rpc", method: "sanityCheck",
+				 	clientTzOffset: clientTzOffset },
 					onComplete: function(transport) {
 					backend_sanity_check_callback(transport);
 				} });
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 88a360f99..a7518959c 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -256,10 +256,12 @@ function init() {
 		var hasAudio = !!a.canPlayType;
 		var hasSandbox = "sandbox" in document.createElement("iframe");
 		var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
+		var clientTzOffset = new Date().getTimezoneOffset() * 60;
 
 		new Ajax.Request("backend.php",	{
 			parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
 				hasMp3: hasMp3,
+			 	clientTzOffset: clientTzOffset,
 				hasSandbox: hasSandbox},
 			onComplete: function(transport) {
 					backend_sanity_check_callback(transport);
diff --git a/lib/timezones.txt b/lib/timezones.txt
index 66824ec93..58108f031 100644
--- a/lib/timezones.txt
+++ b/lib/timezones.txt
@@ -1,3 +1,4 @@
+Automatic
 Africa/Abidjan
 Africa/Accra
 Africa/Addis_Ababa
-- 
cgit v1.2.3-54-g00ecf


From 96f0cbe30d05ea41bb95fcc1487e2e2d5c55f966 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 26 Apr 2013 10:48:00 +0400
Subject: clientTzOffset: use proper sign

---
 include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 4272c649d..1ab92475d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -872,7 +872,7 @@
 
 			$tz_offset = $user_tz->getOffset($dt);
 		} else {
-			$tz_offset = (int) $_SESSION["clientTzOffset"];
+			$tz_offset = (int) -$_SESSION["clientTzOffset"];
 		}
 
 		$user_timestamp = $dt->format('U') + $tz_offset;
-- 
cgit v1.2.3-54-g00ecf


From 3fbb4d183d6b0cb4b6d9d2d8d62d635eb70ebf13 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 26 Apr 2013 14:15:57 +0400
Subject: set default timezone to automatic (bump schema)

---
 include/functions.php         | 2 +-
 schema/ttrss_schema_mysql.sql | 6 +++---
 schema/ttrss_schema_pgsql.sql | 6 +++---
 schema/versions/mysql/119.sql | 7 +++++++
 schema/versions/pgsql/119.sql | 7 +++++++
 5 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 schema/versions/mysql/119.sql
 create mode 100644 schema/versions/pgsql/119.sql

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 1ab92475d..f1e78dfb7 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 118);
+	define('SCHEMA_VERSION', 119);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 0d0a8f460..efa7be7cf 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -300,7 +300,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (118);
+insert into ttrss_version values (119);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -385,7 +385,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_HIDE_READ', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_SORT_FEEDS_UNREAD', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_THEME_ID', 2, '0', 1);
-insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_TIMEZONE', 2, 'UTC', 1);
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_TIMEZONE', 2, 'Automatic', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_STYLESHEET', 2, '', 2);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'false', 2);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', 1);
@@ -485,7 +485,7 @@ create table ttrss_error_log(
 	errno integer not null,
 	errstr text not null,
 	filename text not null,
-	lineno integer not null,	
+	lineno integer not null,
 	context text not null,
 	created_at datetime not null,
 	foreign key (owner_uid) references ttrss_users(id) ON DELETE SET NULL) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index d81f65f2b..c04e5224b 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -258,7 +258,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (118);
+insert into ttrss_version values (119);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -336,7 +336,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_HIDE_READ', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_SORT_FEEDS_UNREAD', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_THEME_ID', 2, '0', 1);
-insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_TIMEZONE', 2, 'UTC', 1);
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_TIMEZONE', 2, 'Automatic', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_STYLESHEET', 2, '', 2);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'false', 2);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', 1);
@@ -428,7 +428,7 @@ create table ttrss_error_log(
 	errno integer not null,
 	errstr text not null,
 	filename text not null,
-	lineno integer not null,	
+	lineno integer not null,
 	context text not null,
 	created_at timestamp not null);
 
diff --git a/schema/versions/mysql/119.sql b/schema/versions/mysql/119.sql
new file mode 100644
index 000000000..ddb7d64de
--- /dev/null
+++ b/schema/versions/mysql/119.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'Automatic' where pref_name = 'USER_TIMEZONE';
+
+update ttrss_version set schema_version = 119;
+
+commit;
diff --git a/schema/versions/pgsql/119.sql b/schema/versions/pgsql/119.sql
new file mode 100644
index 000000000..ddb7d64de
--- /dev/null
+++ b/schema/versions/pgsql/119.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'Automatic' where pref_name = 'USER_TIMEZONE';
+
+update ttrss_version set schema_version = 119;
+
+commit;
-- 
cgit v1.2.3-54-g00ecf


From c35d0d8fdc06dbbbc2ebf20d15e3561ffe0487a5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 27 Apr 2013 12:20:45 +0400
Subject: fix typo in format_article_labels()

---
 include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index f1e78dfb7..6337dbbde 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3437,7 +3437,7 @@
 
 	function format_article_labels($labels, $id) {
 
-		if (is_array($labels)) return '';
+		if (!is_array($labels)) return '';
 
 		$labels_str = "";
 
-- 
cgit v1.2.3-54-g00ecf


From 1ee4900a54b9aba69d115a5f4a513fef31655452 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 27 Apr 2013 17:12:48 +0400
Subject: fix startup_gettext() trying to get configured language before
 session is initialized

---
 include/functions.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 6337dbbde..5da657f2d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -95,8 +95,11 @@
 			$lang = _TRANSLATION_OVERRIDE_DEFAULT;
 		}
 
-		if ($_SESSION["language"] && $_SESSION["language"] != "auto") {
-			$lang = $_SESSION["language"];
+		// startup_gettext() is called before session_start() so we can't rely
+		// on $_SESSION['language'] here.
+
+		if ($_COOKIE["ttrss_lang"] && $_COOKIE["ttrss_lang"] != "auto") {
+			$lang = $_COOKIE["ttrss_lang"];
 		}
 
 		if ($lang) {
-- 
cgit v1.2.3-54-g00ecf


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 +-
 config.php-dist        | 4 ----
 include/functions.php  | 6 ++++--
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'include/functions.php')

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));
 	}
diff --git a/config.php-dist b/config.php-dist
index 72b6fd1b8..58218bab1 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -139,10 +139,6 @@
 	define('SESSION_COOKIE_LIFETIME', 86400);
 	// Default lifetime of a session (e.g. login) cookie. In seconds, 
 	// 0 means cookie will be deleted when browser closes.
-	// Setting this to zero will affect several user preferences
-	// like widescreen mode not saving and disable "remember me".
-	// Note that if remember me is not checked, session cookie
-	// will always expire with browser session.
 
 	define('SESSION_CHECK_ADDRESS', 1);
 	// Check client IP address when validating session:
diff --git a/include/functions.php b/include/functions.php
index 5da657f2d..38c3eac32 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -5,6 +5,8 @@
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
 
+	define('COOKIE_LIFETIME_LONG', 86400*365);
+
 	$fetch_last_error = false;
 	$fetch_last_error_code = false;
 	$fetch_last_content_type = false;
@@ -796,9 +798,9 @@
 				$_SESSION["last_login_update"] = time();
 			}
 
-			if ($_SESSION["uid"] && $_SESSION["language"] && SESSION_COOKIE_LIFETIME > 0) {
+			if ($_SESSION["uid"] && $_SESSION["language"]) {
 				setcookie("ttrss_lang", $_SESSION["language"],
-					time() + SESSION_COOKIE_LIFETIME);
+					time() + COOKIE_LIFETIME_LONG);
 			}
 
 			if ($_SESSION["uid"]) {
-- 
cgit v1.2.3-54-g00ecf


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 ++++++++------------------------
 include/functions.php         | 19 +++++++------------
 include/login_form.php        |  8 --------
 schema/ttrss_schema_mysql.sql |  3 ++-
 schema/ttrss_schema_pgsql.sql |  3 ++-
 schema/versions/mysql/120.sql |  7 +++++++
 schema/versions/pgsql/120.sql |  7 +++++++
 8 files changed, 34 insertions(+), 55 deletions(-)
 create mode 100644 schema/versions/mysql/120.sql
 create mode 100644 schema/versions/pgsql/120.sql

(limited to 'include/functions.php')

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"));
 
diff --git a/include/functions.php b/include/functions.php
index 38c3eac32..b3130104b 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 119);
+	define('SCHEMA_VERSION', 120);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -97,11 +97,12 @@
 			$lang = _TRANSLATION_OVERRIDE_DEFAULT;
 		}
 
-		// startup_gettext() is called before session_start() so we can't rely
-		// on $_SESSION['language'] here.
+		if ($_SESSION["uid"]) {
+			$pref_lang = get_pref("USER_LANGUAGE", $_SESSION["uid"], false);
 
-		if ($_COOKIE["ttrss_lang"] && $_COOKIE["ttrss_lang"] != "auto") {
-			$lang = $_COOKIE["ttrss_lang"];
+			if ($pref_lang) {
+				$lang = $pref_lang;
+			}
 		}
 
 		if ($lang) {
@@ -118,8 +119,6 @@
 		}
 	}
 
-	startup_gettext();
-
 	require_once 'db-prefs.php';
 	require_once 'version.php';
 	require_once 'ccache.php';
@@ -798,12 +797,8 @@
 				$_SESSION["last_login_update"] = time();
 			}
 
-			if ($_SESSION["uid"] && $_SESSION["language"]) {
-				setcookie("ttrss_lang", $_SESSION["language"],
-					time() + COOKIE_LIFETIME_LONG);
-			}
-
 			if ($_SESSION["uid"]) {
+				startup_gettext();
 				load_user_plugins($_SESSION["uid"]);
 
 				/* cleanup ccache */
diff --git a/include/login_form.php b/include/login_form.php
index 9a20e9be9..b7dae1016 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -201,14 +201,6 @@ function bwLimitChange(elem) {
 
 		<?php } ?>
 
-		<div class="row">
-			<label><?php echo __("Language:") ?></label>
-			<?php
-				print_select_hash("language", $_COOKIE["ttrss_lang"], get_translations(),
-					"style='width : 220px; margin : 0px' dojoType='dijit.form.Select'");
-			?>
-		</div>
-
 		<div class="row">
 			<label><?php echo __("Profile:") ?></label>
 
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index efa7be7cf..aa1197091 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -300,7 +300,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (119);
+insert into ttrss_version values (120);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -397,6 +397,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('AUTO_AS
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_ENABLED_PLUGINS', 2, '', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_CSS_THEME', 2, '', 2);
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_LANGUAGE', 2, '', 2);
 
 update ttrss_prefs set access_level = 1 where pref_name in ('ON_CATCHUP_SHOW_NEXT_FEED',
 	'SORT_HEADLINES_BY_FEED_DATE',
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index c04e5224b..79634678d 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -258,7 +258,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (119);
+insert into ttrss_version values (120);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -348,6 +348,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('AUTO_AS
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_ENABLED_PLUGINS', 2, '', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_CSS_THEME', 2, '', 2);
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_LANGUAGE', 2, '', 2);
 
 update ttrss_prefs set access_level = 1 where pref_name in ('ON_CATCHUP_SHOW_NEXT_FEED',
 	'SORT_HEADLINES_BY_FEED_DATE',
diff --git a/schema/versions/mysql/120.sql b/schema/versions/mysql/120.sql
new file mode 100644
index 000000000..34971146e
--- /dev/null
+++ b/schema/versions/mysql/120.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_LANGUAGE', 2, '', 2);
+
+update ttrss_version set schema_version = 120;
+
+commit;
diff --git a/schema/versions/pgsql/120.sql b/schema/versions/pgsql/120.sql
new file mode 100644
index 000000000..34971146e
--- /dev/null
+++ b/schema/versions/pgsql/120.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_LANGUAGE', 2, '', 2);
+
+update ttrss_version set schema_version = 120;
+
+commit;
-- 
cgit v1.2.3-54-g00ecf


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 ++++-
 include/functions.php      | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'include/functions.php')

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"];
 
diff --git a/include/functions.php b/include/functions.php
index b3130104b..c39b4938c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -97,8 +97,8 @@
 			$lang = _TRANSLATION_OVERRIDE_DEFAULT;
 		}
 
-		if ($_SESSION["uid"]) {
-			$pref_lang = get_pref("USER_LANGUAGE", $_SESSION["uid"], false);
+		if ($_SESSION["uid"] && get_schema_version() >= 120) {
+			$pref_lang = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
 
 			if ($pref_lang) {
 				$lang = $pref_lang;
-- 
cgit v1.2.3-54-g00ecf


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 +++++---
 include/functions.php | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'include/functions.php')

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>
diff --git a/include/functions.php b/include/functions.php
index c39b4938c..0b8f5b0d5 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2902,7 +2902,6 @@
 			ttrss_tags WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
 			ref_id = '$a_id' AND owner_uid = '$owner_uid' LIMIT 1) ORDER BY tag_name";
 
-		$obj_id = md5("TAGS:$owner_uid:$id");
 		$tags = array();
 
 		/* check cache first */
@@ -3249,7 +3248,7 @@
 
 	function print_checkpoint($n, $s) {
 		$ts = microtime(true);
-		echo sprintf("<!-- CP[$n] %.4f seconds -->", $ts - $s);
+		echo sprintf("<!-- CP[$n] %.4f seconds -->\n", $ts - $s);
 		return $ts;
 	}
 
-- 
cgit v1.2.3-54-g00ecf


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 -
 include/functions.php | 45 ++++++++++-----------------------------------
 2 files changed, 10 insertions(+), 36 deletions(-)

(limited to 'include/functions.php')

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"]) {
diff --git a/include/functions.php b/include/functions.php
index 0b8f5b0d5..15a875746 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3391,47 +3391,22 @@
 	}
 
 	function format_tags_string($tags, $id) {
+		if (!is_array($tags) || count($tags) == 0) {
+			return __("no tags");
+		} else {
+			$maxtags = min(5, count($tags));
 
-		$tags_str = "";
-		$tags_nolinks_str = "";
-
-		$num_tags = 0;
-
-		$tag_limit = 6;
-
-		$formatted_tags = array();
-
-		foreach ($tags as $tag) {
-			$num_tags++;
-			$tag_escaped = str_replace("'", "\\'", $tag);
-
-			if (mb_strlen($tag) > 30) {
-				$tag = truncate_string($tag, 30);
-			}
-
-			$tag_str = "<a href=\"javascript:viewfeed('$tag_escaped')\">$tag</a>";
-
-			array_push($formatted_tags, $tag_str);
-
-			$tmp_tags_str = implode(", ", $formatted_tags);
-
-			if ($num_tags == $tag_limit || mb_strlen($tmp_tags_str) > 150) {
-				break;
+			for ($i = 0; $i < $maxtags; $i++) {
+				$tags_str .= "<a href=\"#\" onclick=\"viewfeed('".$tags[$i]."'\")>" . $tags[$i] . "</a>, ";
 			}
-		}
 
-		$tags_str = implode(", ", $formatted_tags);
+			$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
 
-		if ($num_tags < count($tags)) {
-			$tags_str .= ", &hellip;";
-		}
+			if (count($tags) > $maxtags)
+				$tags_str .= ", &hellip;";
 
-		if ($num_tags == 0) {
-			$tags_str = __("no tags");
+			return $tags_str;
 		}
-
-		return $tags_str;
-
 	}
 
 	function format_article_labels($labels, $id) {
-- 
cgit v1.2.3-54-g00ecf


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

---
 api/index.php                           |  2 +-
 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 +-
 include/colors.php                      | 10 ++---
 include/functions.php                   |  9 ++--
 include/rssfuncs.php                    |  4 +-
 index.php                               | 10 ++---
 install/index.php                       |  2 +-
 lib/MiniTemplator.class.php             |  4 +-
 lib/phpqrcode/bindings/tcpdf/qrcode.php |  8 ++--
 lib/phpqrcode/phpqrcode.php             | 12 ++---
 lib/phpqrcode/qrencode.php              |  2 +-
 lib/phpqrcode/qrmask.php                |  4 +-
 lib/phpqrcode/qrsplit.php               |  8 ++--
 plugins/af_unburn/init.php              |  2 +-
 plugins/auth_internal/init.php          |  2 +-
 plugins/auth_remote/init.php            |  2 +-
 prefs.php                               | 10 ++---
 update.php                              |  2 +-
 27 files changed, 103 insertions(+), 104 deletions(-)

(limited to 'include/functions.php')

diff --git a/api/index.php b/api/index.php
index 9f0d93f69..facdf82c5 100644
--- a/api/index.php
+++ b/api/index.php
@@ -57,7 +57,7 @@
 
 	$method = strtolower($_REQUEST["op"]);
 
-	$handler = new API(Db::get(), $_REQUEST);
+	$handler = new API($_REQUEST);
 
 	if ($handler->before($method)) {
 		if ($method && method_exists($handler, $method)) {
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 = '';
diff --git a/include/colors.php b/include/colors.php
index 7cf1a6af0..41bf7b819 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -237,16 +237,16 @@ function rgb2hsl($arr) {
    } else {
       $s = $del_Max / $var_Max;
 
-      $del_R = ((($max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-      $del_G = ((($max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-      $del_B = ((($max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 
       if      ($var_R == $var_Max) $h = $del_B - $del_G;
       else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
       else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
 
-      if ($H < 0) $h++;
-      if ($H > 1) $h--;
+      if ($h < 0) $h++;
+      if ($h > 1) $h--;
    }
 
    return array($h, $s, $v);
diff --git a/include/functions.php b/include/functions.php
index 15a875746..414196e9c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1162,7 +1162,7 @@
 
 		$data = array_merge($data, getVirtCounters());
 		$data = array_merge($data, getLabelCounters());
-		$data = array_merge($data, getFeedCounters($active_feed));
+		$data = array_merge($data, getFeedCounters());
 		$data = array_merge($data, getCategoryCounters());
 
 		return $data;
@@ -1286,7 +1286,7 @@
 
 			return $unread;
 		} else if ($cat == -1) {
-			return getFeedUnread(-1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0);
+			return getFeedUnread(-1) + getFeedUnread(-2) + getFeedUnread(-3) + getFeedUnread(0);
 		} else if ($cat == -2) {
 
 			$result = db_query("
@@ -1726,7 +1726,8 @@
 			}
 
 			if (!$root_id) {
-				$is_selected = ($default_id == "CAT:0") ? "selected=\"1\"" : "";
+				$default_is_cat = ($default_id == "CAT:0");
+				$is_selected = $default_is_cat ? "selected=\"1\"" : "";
 
 				printf("<option $is_selected value='CAT:0'>%s</option>",
 					__("Uncategorized"));
@@ -4099,7 +4100,7 @@
 				preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
 				$url = trim(str_replace($matches[1],"",$matches[0]));
 				$url_parsed = parse_url($url);
-				return (isset($url_parsed))? geturl($url, $referer):'';
+				return (isset($url_parsed))? geturl($url):'';
 			}
 			$oline='';
 			foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 61f6ee6a0..612c914c0 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -334,7 +334,7 @@
 		}
 
 		$pluginhost = new PluginHost();
-		$pluginhost->set_debug($debug_enabled, $debug_enabled);
+		$pluginhost->set_debug($debug_enabled);
 		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
 		$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
@@ -411,7 +411,7 @@
 
 				_debug("checking favicon...", $debug_enabled);
 
-				check_feed_favicon($site_url, $feed, $link);
+				check_feed_favicon($site_url, $feed);
 				$favicon_modified_new = @filemtime($favicon_file);
 
 				if ($favicon_modified_new > $favicon_modified)
diff --git a/index.php b/index.php
index 6a34be5e8..29b8b173d 100644
--- a/index.php
+++ b/index.php
@@ -56,14 +56,14 @@
 <head>
 	<title>Tiny Tiny RSS</title>
 
-	<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
-	<?php echo stylesheet_tag("tt-rss.css"); ?>
-	<?php echo stylesheet_tag("cdm.css"); ?>
+	<?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
+	<?php stylesheet_tag("tt-rss.css"); ?>
+	<?php stylesheet_tag("cdm.css"); ?>
 
 	<?php if ($_SESSION["uid"]) {
 		$theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
 		if ($theme) {
-			echo stylesheet_tag("themes/$theme");
+			stylesheet_tag("themes/$theme");
 		}
 	}
 	?>
@@ -91,7 +91,7 @@
 				"lib/dojo/tt-rss-layer.js",
 				"errors.php?mode=js") as $jsfile) {
 
-		echo javascript_tag($jsfile);
+		javascript_tag($jsfile);
 
 	} ?>
 
diff --git a/install/index.php b/install/index.php
index cd017f995..6cb2ace4f 100644
--- a/install/index.php
+++ b/install/index.php
@@ -89,7 +89,7 @@
 			<span><img src=\"../images/sign_info.svg\"></span><span>$msg</span></div>";
 	}
 
-	function db_connect($host, $user, $pass, $db, $type, $port) {
+	function db_connect($host, $user, $pass, $db, $type, $port = false) {
 		if ($type == "pgsql") {
 
 			$string = "dbname=$db user=$user";
diff --git a/lib/MiniTemplator.class.php b/lib/MiniTemplator.class.php
index 69281cb5e..a139473f9 100644
--- a/lib/MiniTemplator.class.php
+++ b/lib/MiniTemplator.class.php
@@ -336,7 +336,7 @@ function processBeginBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {
    $this->openBlocksTab[$this->currentNestingLevel] = $blockNo;
    $this->currentNestingLevel += 1;
    if ($this->currentNestingLevel > $this->maxNestingLevel) {
-      $trhis->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");
+      $this->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");
       return false; }
    return true; }
 
@@ -844,7 +844,7 @@ function readFileIntoString ($fileName, &$s) {
    $fh = fopen($fileName,"rb");
    if ($fh === false) return false;
    $fileSize = filesize($fileName);
-   if ($fileSize === false) {close ($fh); return false; }
+   if ($fileSize === false) {fclose ($fh); return false; }
    $s = fread($fh,$fileSize);
    fclose ($fh);
    if (strlen($s) != $fileSize) return false;
diff --git a/lib/phpqrcode/bindings/tcpdf/qrcode.php b/lib/phpqrcode/bindings/tcpdf/qrcode.php
index 7995460b5..9001e3a2e 100644
--- a/lib/phpqrcode/bindings/tcpdf/qrcode.php
+++ b/lib/phpqrcode/bindings/tcpdf/qrcode.php
@@ -1101,7 +1101,7 @@ if (!class_exists('QRcode', false)) {
 		 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
 			$b = 0;
 			$bitMask = array();
-			$bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+			$bitMask = $this->generateMaskNo($maskNo, $width, $s);
 			if ($maskGenOnly) {
 				return;
 			}
@@ -1399,7 +1399,7 @@ if (!class_exists('QRcode', false)) {
 				$p += 2;
 			}
 			$this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr));
-			return $run;
+			return $p;
 		}
 
 		/**
@@ -1470,7 +1470,7 @@ if (!class_exists('QRcode', false)) {
 						break;
 					}
 					case QR_MODE_KJ: {
-						if ($hint == QR_MODE_KJ) {
+						if ($this->hint == QR_MODE_KJ) {
 							$length = $this->eatKanji();
 						} else {
 							$length = $this->eat8();
@@ -1499,7 +1499,7 @@ if (!class_exists('QRcode', false)) {
 			$stringLen = strlen($this->dataStr);
 			$p = 0;
 			while ($p < $stringLen) {
-				$mode = $this->identifyMode(substr($this->dataStr, $p), $this->hint);
+				$mode = $this->identifyMode(substr($this->dataStr, $p));
 				if ($mode == QR_MODE_KJ) {
 					$p += 2;
 				} else {
diff --git a/lib/phpqrcode/phpqrcode.php b/lib/phpqrcode/phpqrcode.php
index 80adb9df2..02b877639 100644
--- a/lib/phpqrcode/phpqrcode.php
+++ b/lib/phpqrcode/phpqrcode.php
@@ -2195,7 +2195,7 @@
                     case QR_MODE_NUM: $length = $this->eatNum(); break;
                     case QR_MODE_AN:  $length = $this->eatAn(); break;
                     case QR_MODE_KANJI:
-                        if ($hint == QR_MODE_KANJI)
+                        if ($this->modeHint == QR_MODE_KANJI)
                                 $length = $this->eatKanji();
                         else    $length = $this->eat8();
                         break;
@@ -2217,7 +2217,7 @@
             $p = 0;
             
             while ($p<$stringLen) {
-                $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint);
+                $mode = self::identifyMode(substr($this->dataStr, $p));
                 if($mode == QR_MODE_KANJI) {
                     $p += 2;
                 } else {
@@ -2621,13 +2621,13 @@
                 if (file_exists($fileName)) {
                     $bitMask = self::unserial(file_get_contents($fileName));
                 } else {
-                    $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+                    $bitMask = $this->generateMaskNo($maskNo, $width, $s);
                     if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))
                         mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
                     file_put_contents($fileName, self::serial($bitMask));
                 }
             } else {
-                $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+                $bitMask = $this->generateMaskNo($maskNo, $width, $s);
             }
 
             if ($maskGenOnly)
@@ -2937,7 +2937,7 @@
         //----------------------------------------------------------------------
         public function getCode()
         {
-            $ret;
+            $ret = 0;
 
             if($this->count < $this->dataLength) {
                 $row = $this->count % $this->blocks;
@@ -3059,7 +3059,7 @@
             $input = new QRinput($version, $level);
             if($input == NULL) return NULL;
 
-            $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));
+            $ret = $input->append(QR_MODE_8, strlen($string), str_split($string));
             if($ret < 0) {
                 unset($input);
                 return NULL;
diff --git a/lib/phpqrcode/qrencode.php b/lib/phpqrcode/qrencode.php
index 4b77a5bdd..5bdeaec20 100644
--- a/lib/phpqrcode/qrencode.php
+++ b/lib/phpqrcode/qrencode.php
@@ -129,7 +129,7 @@
         //----------------------------------------------------------------------
         public function getCode()
         {
-            $ret;
+            $ret = 0;
 
             if($this->count < $this->dataLength) {
                 $row = $this->count % $this->blocks;
diff --git a/lib/phpqrcode/qrmask.php b/lib/phpqrcode/qrmask.php
index b14d7ae16..43d653ce3 100644
--- a/lib/phpqrcode/qrmask.php
+++ b/lib/phpqrcode/qrmask.php
@@ -149,13 +149,13 @@
                 if (file_exists($fileName)) {
                     $bitMask = self::unserial(file_get_contents($fileName));
                 } else {
-                    $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+                    $bitMask = $this->generateMaskNo($maskNo, $width, $s);
                     if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))
                         mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
                     file_put_contents($fileName, self::serial($bitMask));
                 }
             } else {
-                $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+                $bitMask = $this->generateMaskNo($maskNo, $width, $s);
             }
 
             if ($maskGenOnly)
diff --git a/lib/phpqrcode/qrsplit.php b/lib/phpqrcode/qrsplit.php
index d75b82737..1f9f65c3b 100644
--- a/lib/phpqrcode/qrsplit.php
+++ b/lib/phpqrcode/qrsplit.php
@@ -186,7 +186,7 @@
             if($ret < 0)
                 return -1;
 
-            return $run;
+            return $ret;
         }
 
         //----------------------------------------------------------------------
@@ -258,7 +258,7 @@
                     case QR_MODE_NUM: $length = $this->eatNum(); break;
                     case QR_MODE_AN:  $length = $this->eatAn(); break;
                     case QR_MODE_KANJI:
-                        if ($hint == QR_MODE_KANJI)
+                        if ($this->modeHint == QR_MODE_KANJI)
                                 $length = $this->eatKanji();
                         else    $length = $this->eat8();
                         break;
@@ -280,7 +280,7 @@
             $p = 0;
             
             while ($p<$stringLen) {
-                $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint);
+                $mode = self::identifyMode(substr($this->dataStr, $p));
                 if($mode == QR_MODE_KANJI) {
                     $p += 2;
                 } else {
@@ -308,4 +308,4 @@
                 
             return $split->splitString();
         }
-    }
\ No newline at end of file
+    }
diff --git a/plugins/af_unburn/init.php b/plugins/af_unburn/init.php
index 62b3b4dcf..a97502b12 100644
--- a/plugins/af_unburn/init.php
+++ b/plugins/af_unburn/init.php
@@ -114,7 +114,7 @@ class Af_Unburn extends Plugin {
 				preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
 				$url = trim(str_replace($matches[1],"",$matches[0]));
 				$url_parsed = parse_url($url);
-				return (isset($url_parsed))? geturl($url, $referer):'';
+				return (isset($url_parsed))? geturl($url):'';
 			}
 			$oline='';
 			foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php
index 79a8e8cb3..87c8555c0 100644
--- a/plugins/auth_internal/init.php
+++ b/plugins/auth_internal/init.php
@@ -51,7 +51,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
 							$return = urlencode($_REQUEST["return"]);
 							?><html>
 								<head><title>Tiny Tiny RSS</title></head>
-								<?php echo stylesheet_tag("utility.css") ?>
+								<?php stylesheet_tag("utility.css") ?>
 							<body class="otp"><div class="content">
 							<form action="public.php?return=<?php echo $return ?>"
 									method="POST" class="otpform">
diff --git a/plugins/auth_remote/init.php b/plugins/auth_remote/init.php
index 2bf090d54..2ec2c87b2 100644
--- a/plugins/auth_remote/init.php
+++ b/plugins/auth_remote/init.php
@@ -45,7 +45,7 @@ class Auth_Remote extends Plugin implements IAuthModule {
 #	  	if (!$try_login) $try_login = "test_qqq";
 
 		if ($try_login) {
-			$user_id = $this->base->auto_create_user($try_login);
+			$user_id = $this->base->auto_create_user($try_login, $password);
 
 			if ($user_id) {
 				$_SESSION["fake_login"] = $try_login;
diff --git a/prefs.php b/prefs.php
index 9bf610a53..b617d94bc 100644
--- a/prefs.php
+++ b/prefs.php
@@ -32,14 +32,14 @@
 <head>
 	<title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
 
-	<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
-	<?php echo stylesheet_tag("tt-rss.css"); ?>
-	<?php echo stylesheet_tag("prefs.css"); ?>
+	<?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
+	<?php stylesheet_tag("tt-rss.css"); ?>
+	<?php stylesheet_tag("prefs.css"); ?>
 
 	<?php if ($_SESSION["uid"]) {
 		$theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
 		if ($theme) {
-			echo stylesheet_tag("themes/$theme");
+			stylesheet_tag("themes/$theme");
 		}
 	}
 	?>
@@ -58,7 +58,7 @@
 				"lib/dojo/tt-rss-layer.js",
 				"errors.php?mode=js") as $jsfile) {
 
-		echo javascript_tag($jsfile);
+		javascript_tag($jsfile);
 
 	} ?>
 
diff --git a/update.php b/update.php
index d4160c7ba..f542a390b 100755
--- a/update.php
+++ b/update.php
@@ -321,7 +321,7 @@
 	}
 
 	if (isset($options["list-plugins"])) {
-		$tmppluginhost = new PluginHost(Db::get());
+		$tmppluginhost = new PluginHost();
 		$tmppluginhost->load_all($tmppluginhost::KIND_ALL);
 		$enabled = array_map("trim", explode(",", PLUGINS));
 
-- 
cgit v1.2.3-54-g00ecf


From 23923fb29b345c1eea5b70a6df4d30395425bf37 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 7 May 2013 15:34:20 +0400
Subject: subscribe_to_feed: use already fetched data when updating initially

---
 include/functions.php |  2 +-
 include/rssfuncs.php  | 89 ++++++++++++++++++++++++++-------------------------
 2 files changed, 46 insertions(+), 45 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 414196e9c..e3e113786 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1661,7 +1661,7 @@
 			$feed_id = db_fetch_result($result, 0, "id");
 
 			if ($feed_id) {
-				update_rss_feed($feed_id, true);
+				update_rss_feed($feed_id, false, false, false, $contents);
 			}
 
 			return array("code" => 1);
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 612c914c0..d5fc14f79 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -191,7 +191,7 @@
 
 	// ignore_daemon is not used
 	function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false,
-		$override_url = false) {
+		$override_url = false, $override_data = false) {
 
 		$debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
 
@@ -251,7 +251,11 @@
 
 		$force_refetch = isset($_REQUEST["force_refetch"]);
 
-		if (file_exists($cache_filename) &&
+		if ($override_data) {
+			$feed_data = $override_data;
+		}
+
+		if (!$feed_data && file_exists($cache_filename) &&
 			is_readable($cache_filename) &&
 			!$auth_login && !$auth_pass &&
 			filemtime($cache_filename) > time() - 30) {
@@ -268,69 +272,66 @@
 			_debug("local cache will not be used for this feed", $debug_enabled);
 		}
 
-		if (!$rss) {
-
-			if (!$feed_data) {
-				_debug("fetching [$fetch_url]...", $debug_enabled);
-				_debug("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $last_article_timestamp), $debug_enabled);
+		if (!$feed_data) {
+			_debug("fetching [$fetch_url]...", $debug_enabled);
+			_debug("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $last_article_timestamp), $debug_enabled);
 
-				$feed_data = fetch_file_contents($fetch_url, false,
-					$auth_login, $auth_pass, false,
-					$no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
-					$force_refetch ? 0 : $last_article_timestamp);
+			$feed_data = fetch_file_contents($fetch_url, false,
+				$auth_login, $auth_pass, false,
+				$no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
+				$force_refetch ? 0 : $last_article_timestamp);
 
-				global $fetch_curl_used;
+			global $fetch_curl_used;
 
-				if (!$fetch_curl_used) {
-					$tmp = @gzdecode($feed_data);
+			if (!$fetch_curl_used) {
+				$tmp = @gzdecode($feed_data);
 
-					if ($tmp) $feed_data = $tmp;
-				}
+				if ($tmp) $feed_data = $tmp;
+			}
 
-				$feed_data = trim($feed_data);
+			$feed_data = trim($feed_data);
 
-				_debug("fetch done.", $debug_enabled);
+			_debug("fetch done.", $debug_enabled);
 
-				if ($feed_data) {
-					$error = verify_feed_xml($feed_data);
+			if ($feed_data) {
+				$error = verify_feed_xml($feed_data);
 
-					if ($error) {
-						_debug("error verifying XML, code: " . $error->code, $debug_enabled);
+				if ($error) {
+					_debug("error verifying XML, code: " . $error->code, $debug_enabled);
 
-						if ($error->code == 26) {
-							_debug("got error 26, trying to decode entities...", $debug_enabled);
+					if ($error->code == 26) {
+						_debug("got error 26, trying to decode entities...", $debug_enabled);
 
-							$feed_data = html_entity_decode($feed_data, ENT_COMPAT, 'UTF-8');
+						$feed_data = html_entity_decode($feed_data, ENT_COMPAT, 'UTF-8');
 
-							$error = verify_feed_xml($feed_data);
+						$error = verify_feed_xml($feed_data);
 
-							if ($error) $feed_data = '';
-						}
+						if ($error) $feed_data = '';
 					}
 				}
 			}
+		}
 
-			if (!$feed_data) {
-				global $fetch_last_error;
-				global $fetch_last_error_code;
+		if (!$feed_data) {
+			global $fetch_last_error;
+			global $fetch_last_error_code;
 
-				_debug("unable to fetch: $fetch_last_error [$fetch_last_error_code]", $debug_enabled);
+			_debug("unable to fetch: $fetch_last_error [$fetch_last_error_code]", $debug_enabled);
 
-				$error_escaped = '';
+			$error_escaped = '';
 
-				// If-Modified-Since
-				if ($fetch_last_error_code != 304) {
-					$error_escaped = db_escape_string($fetch_last_error);
-				} else {
-					_debug("source claims data not modified, nothing to do.", $debug_enabled);
-				}
+			// If-Modified-Since
+			if ($fetch_last_error_code != 304) {
+				$error_escaped = db_escape_string($fetch_last_error);
+			} else {
+				_debug("source claims data not modified, nothing to do.", $debug_enabled);
+			}
 
-				db_query(
-					"UPDATE ttrss_feeds SET last_error = '$error_escaped',
-						last_updated = NOW() WHERE id = '$feed'");
+			db_query(
+				"UPDATE ttrss_feeds SET last_error = '$error_escaped',
+					last_updated = NOW() WHERE id = '$feed'");
 
-				return;
-			}
+			return;
 		}
 
 		$pluginhost = new PluginHost();
-- 
cgit v1.2.3-54-g00ecf