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

---
 include/rssfuncs.php     | 2 +-
 include/sanity_check.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 727e42897..7c2e1655b 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1191,7 +1191,7 @@
 	}
 
 	function expire_cached_files($debug) {
-		foreach (array("simplepie", "images", "export") as $dir) {
+		foreach (array("simplepie", "images", "export", "upload") as $dir) {
 			$cache_dir = CACHE_DIR . "/$dir";
 
 			if ($debug) _debug("Expiring $cache_dir");
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 99d3051f3..69309290e 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -55,6 +55,10 @@
 				array_push($errors, "Image cache is not writable (chmod -R 777 ".CACHE_DIR."/images)");
 			}
 
+			if (!is_writable(CACHE_DIR . "/upload")) {
+				array_push($errors, "Upload cache is not writable (chmod -R 777 ".CACHE_DIR."/upload)");
+			}
+
 			if (!is_writable(CACHE_DIR . "/export")) {
 				array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
 			}
@@ -102,10 +106,6 @@
 				array_push($errors, "LOCK_DIRECTORY defined in config.php is not writable (chmod -R 777 ".LOCK_DIRECTORY.").\n");
 			}
 
-			if (ini_get("open_basedir")) {
-				array_push($errors, "PHP configuration option open_basedir is not supported. Please disable this in PHP settings file (php.ini).");
-			}
-
 			if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
 				array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
 			}
-- 
cgit v1.2.3


From 9bfda43e775ff23d980795363c3c792fd6d8b89d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 12 Apr 2013 09:55:41 +0400
Subject: digest: use proper logging, update.php: fix typo

---
 include/digest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/digest.php b/include/digest.php
index ab29d9432..34b699094 100644
--- a/include/digest.php
+++ b/include/digest.php
@@ -33,7 +33,7 @@
 				if ($preferred_ts && time() >= $preferred_ts &&
 						time() - $preferred_ts <= 7200) {
 
-					if ($debug) print "Sending digest for UID:" . $line['id'] . " - " . $line["email"] . " ... ";
+					if ($debug) _debug("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
 
 					$do_catchup = get_pref($link, 'DIGEST_CATCHUP', $line['id'], false);
 
@@ -54,16 +54,16 @@
 
 						$rc = $mail->quickMail($line["email"], $line["login"] , DIGEST_SUBJECT, $digest, $digest_text);
 
-						if (!$rc && $debug) print "ERROR: " . $mail->ErrorInfo;
+						if (!$rc && $debug) _debug("ERROR: " . $mail->ErrorInfo);
 
-						if ($debug) print "RC=$rc\n";
+						if ($debug) _debug("RC=$rc");
 
 						if ($rc && $do_catchup) {
-							if ($debug) print "Marking affected articles as read...\n";
+							if ($debug) _debug("Marking affected articles as read...");
 							catchupArticlesById($link, $affected_ids, 0, $line["id"]);
 						}
 					} else {
-						if ($debug) print "No headlines\n";
+						if ($debug) _debug("No headlines");
 					}
 
 					db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW()
-- 
cgit v1.2.3


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

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


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

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


From c5569ff8d30d3cda4667d5e22923455a68482478 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 12 Apr 2013 16:30:40 +0400
Subject: decode html entities in article title on import

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 7c2e1655b..6e3ef4cf1 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -524,7 +524,7 @@
 					_debug("update_rss_feed: date $entry_timestamp [$entry_timestamp_fmt]");
 				}
 
-				$entry_title = $item->get_title();
+				$entry_title = html_entity_decode($item->get_title());
 
 				$entry_link = rewrite_relative_url($site_url, $item->get_link());
 
-- 
cgit v1.2.3


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

---
 include/crypt.php         | 36 ++++++++++++++++++++++++++++++++++++
 include/functions.php     | 12 ++++++++++--
 include/rssfuncs.php      |  9 ++++++++-
 include/sanity_check.php  |  8 ++++++++
 include/sanity_config.php |  4 ++--
 5 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 include/crypt.php

(limited to 'include')

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'); ?>
-- 
cgit v1.2.3


From 5276b7c768332800f6a39658d99b103f81b1598d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 13 Apr 2013 18:32:57 +0400
Subject: fix handling of blank FEED_CRYPT_KEY

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

(limited to 'include')

diff --git a/include/sanity_check.php b/include/sanity_check.php
index b4102d234..29de4ff5e 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -67,11 +67,11 @@
 				array_push($errors, "Javascript cache is not writable (chmod -R 777 ".CACHE_DIR."/js)");
 			}
 
-			if (strlen(FEED_CRYPT_KEY) != 24) {
+			if (strlen(FEED_CRYPT_KEY) > 0 && 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")) {
+			if (strlen(FEED_CRYPT_KEY) > 0 && !function_exists("mcrypt_decrypt")) {
 				array_push($errors, "FEED_CRYPT_KEY requires mcrypt functions which are not found.");
 			}
 
-- 
cgit v1.2.3


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

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

(limited to 'include')

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


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

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


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.

---
 include/functions.php | 42 ++++++++++++++++++++++++++++++++++++++++++
 include/rssfuncs.php  | 11 ++++++++---
 2 files changed, 50 insertions(+), 3 deletions(-)

(limited to 'include')

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


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 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'include')

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


From 687a4f59c8d8be091b732ae6714fbdc140169d47 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 15:08:00 +0400
Subject: store favicon color as #rrggbb; process existing favicons

---
 include/rssfuncs.php | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 498700906..bcc88dc2a 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -259,6 +259,8 @@
 		$cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0;
 		$last_updated_timestamp = strtotime($last_updated);
 
+		$force_refetch = isset($_REQUEST["force_refetch"]);
+
 		if (file_exists($cache_filename) &&
 			is_readable($cache_filename) &&
 			!$auth_login && !$auth_pass &&
@@ -275,7 +277,7 @@
 						$rss_hash = sha1($rss_data);
 						@$rss = unserialize($rss_data);
 					}
-				} else {
+				} else if (!$force_refetch) {
 					if ($debug_enabled) {
 						_debug("update_rss_feed: local cache valid and older than last_updated, nothing to do.");
 					}
@@ -290,8 +292,6 @@
 					_debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)");
 				}
 
-				$force_refetch = isset($_REQUEST["force_refetch"]);
-
 				$feed_data = fetch_file_contents($fetch_url, false,
 					$auth_login, $auth_pass, false,
 					$no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
@@ -403,18 +403,24 @@
 
 			$site_url = db_escape_string($link, mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
 
-			if ($debug_enabled) {
-				_debug("update_rss_feed: checking favicon...");
-			}
+			if ($favicon_needs_check || $force_refetch) {
+				if ($debug_enabled) {
+					_debug("update_rss_feed: checking favicon...");
+				}
+
+				check_feed_favicon($site_url, $feed, $link);
+				$favicon_file = ICONS_DIR . "/$feed.ico";
+
+				if (file_exists($favicon_file)) {
+					    $favicon_color = calculate_avg_color($favicon_file);
 
-			if ($favicon_needs_check) {
-				$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)) . "'";
+						 require_once "colors.php";
+
+                   if (is_array($favicon_color))
+							  $favicon_colorstring = ",favicon_avg_color = '" .
+							  		_color_pack(array_slice($favicon_color, 0, 3)) . "'";
                 }
-				
+
 				db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring
 					WHERE id = '$feed'");
 			}
-- 
cgit v1.2.3


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

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

(limited to 'include')

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


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

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


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

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 0d55dce36..250534bd7 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -417,6 +417,8 @@
 						 $favicon_color = db_escape_string($link,
 							 calculate_avg_color($favicon_file));
 
+						 if ($debug_enabled) _debug("color: $favicon_color");
+
 						 $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
 				}
 
-- 
cgit v1.2.3


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

---
 include/colors.php   |  2 +-
 include/rssfuncs.php | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/colors.php b/include/colors.php
index 19c891517..1359b9e2d 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -336,6 +336,6 @@ function hsl2rgb($arr) {
 				}
 			}
 		}
-		return false;
+		return '';
 	}
 ?>
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 250534bd7..283e48532 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -412,17 +412,16 @@
 				$favicon_file = ICONS_DIR . "/$feed.ico";
 
 				if (file_exists($favicon_file)) {
-						 require_once "colors.php";
+						require_once "colors.php";
 
-						 $favicon_color = db_escape_string($link,
-							 calculate_avg_color($favicon_file));
+						$favicon_color = db_escape_string($link,
+							calculate_avg_color($favicon_file));
 
-						 if ($debug_enabled) _debug("color: $favicon_color");
-
-						 $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
+						$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
 				}
 
-				db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring
+				db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
+					$favicon_colorstring
 					WHERE id = '$feed'");
 			}
 
-- 
cgit v1.2.3


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

---
 include/rssfuncs.php | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 283e48532..b3bf25849 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -517,14 +517,16 @@
 				if (!$entry_guid) $entry_guid = $item->get_link();
 				if (!$entry_guid) $entry_guid = make_guid_from_title($item->get_title());
 
-				if ($debug_enabled) {
-					_debug("update_rss_feed: guid $entry_guid");
-				}
-
 				if (!$entry_guid) continue;
 
 				$entry_guid = "$owner_uid,$entry_guid";
 
+				$entry_guid_hashed = db_escape_string($link, 'SHA1:' . sha1($entry_guid));
+
+				if ($debug_enabled) {
+					_debug("update_rss_feed: guid $entry_guid / $entry_guid_hashed");
+				}
+
 				$entry_timestamp = "";
 
 				$entry_timestamp = strtotime($item->get_date());
@@ -633,7 +635,7 @@
 
 				// 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)."' AND owner_uid = $owner_uid");
+					WHERE ref_id = id AND (guid = '".db_escape_string($link, $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");
@@ -684,7 +686,7 @@
 				db_query($link, "BEGIN");
 
 				$result = db_query($link, "SELECT id FROM	ttrss_entries
-					WHERE guid = '$entry_guid'");
+					WHERE (guid = '$entry_guid' OR guid = '$entry_guid_hashed')");
 
 				if (db_num_rows($result) == 0) {
 
@@ -712,7 +714,7 @@
 							author)
 						VALUES
 							('$entry_title',
-							'$entry_guid',
+							'$entry_guid_hashed',
 							'$entry_link',
 							'$entry_timestamp_fmt',
 							'$entry_content',
@@ -745,13 +747,13 @@
 				// now it should exist, if not - bad luck then
 
 				$result = db_query($link, "SELECT
-						id,content_hash,no_orig_date,title,plugin_data,
+						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,
 						num_comments
 					FROM
 						ttrss_entries
-					WHERE guid = '$entry_guid'");
+					WHERE guid = '$entry_guid' OR guid = '$entry_guid_hashed'");
 
 				$entry_ref_id = 0;
 				$entry_int_id = 0;
@@ -759,7 +761,7 @@
 				if (db_num_rows($result) == 1) {
 
 					if ($debug_enabled) {
-						_debug("update_rss_feed: base guid [$entry_guid] found, checking for user record");
+						_debug("update_rss_feed: base guid found, checking for user record");
 					}
 
 					// this will be used below in update handler
@@ -773,6 +775,14 @@
 					$ref_id = db_fetch_result($result, 0, "id");
 					$entry_ref_id = $ref_id;
 
+					/* $stored_guid = db_fetch_result($result, 0, "guid");
+					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
+							id = '$ref_id'");
+					} */
+
 					// check for user post link to main table
 
 					// do we allow duplicate posts with same GUID in different feeds?
@@ -933,7 +943,7 @@
 					if ($post_needs_update) {
 
 						if (defined('DAEMON_EXTENDED_DEBUG')) {
-							_debug("update_rss_feed: post $entry_guid needs update...");
+							_debug("update_rss_feed: post $entry_guid_hashed needs update...");
 						}
 
 //						print "<!-- post $orig_title needs update : $post_needs_update -->";
-- 
cgit v1.2.3


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

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


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

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

(limited to 'include')

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\"
-- 
cgit v1.2.3


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

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

(limited to 'include')

diff --git a/include/sanity_config.php b/include/sanity_config.php
index 0c829981e..255b404d6 100644
--- a/include/sanity_config.php
+++ b/include/sanity_config.php
@@ -1,3 +1,3 @@
-<?php # This file has been generated at:  Sat Apr 13 17:41:19 MSK 2013
+<?php # This file has been generated at:  Tue Apr 16 16:38:38 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_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_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>
-- 
cgit v1.2.3


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

---
 include/functions.php     | 4 +++-
 include/sanity_config.php | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'include')

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


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

---
 include/errorhandler.php | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/functions.php    | 15 ++++++++++++---
 include/sessions.php     |  1 +
 3 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 include/errorhandler.php

(limited to 'include')

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";
-- 
cgit v1.2.3


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

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

(limited to 'include')

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 13eed0e30..bb60592b7 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -8,7 +8,7 @@ function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
 
 	if (!$logger) $logger = new Logger_SQL();
 
-	$errfile = str_replace(dirname(dirname(__FILE__)), "", $errfile);
+	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
 	if ($logger) {
 		return $logger->log_error($errno, $errstr, $file, $line, $context);
@@ -35,7 +35,7 @@ function ttrss_fatal_handler() {
 
 		$context = debug_backtrace();
 
-		$file = str_replace(dirname(dirname(__FILE__)) . "/", "", $file);
+		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
 		if (!$logger) $logger = new Logger_SQL();
 
-- 
cgit v1.2.3


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

---
 include/rssfuncs.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index b3bf25849..0a20f5d8e 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -148,6 +148,7 @@
 
 		expire_cached_files($debug);
 		expire_lock_files($debug);
+		expire_error_log($link, $debug);
 
 		$nf = 0;
 
@@ -1197,6 +1198,19 @@
 		return $doc->saveXML($node);
 	}
 
+	function expire_error_log($link, $debug) {
+		if ($debug) _debug("Removing old error log entries...");
+
+		if (DB_TYPE == "pgsql") {
+			db_query($link, "DELETE FROM ttrss_error_log
+				WHERE created_at < NOW() - INTERVAL '7 days'");
+		} else {
+			db_query($link, "DELETE FROM ttrss_error_log
+				WHERE created_at < DATE_SUB(NOW(), INTERVAL 7 DAY)");
+		}
+
+	}
+
 	function expire_lock_files($debug) {
 		if ($debug) _debug("Removing old lock files...");
 
-- 
cgit v1.2.3


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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

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


From 7970c0925505ba1bd3b3dd15a45bebf2e839f5cf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 23:16:51 +0400
Subject: remove floIcon: bugs

---
 include/colors.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'include')

diff --git a/include/colors.php b/include/colors.php
index 1359b9e2d..9e4429a78 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once "lib/floIcon.php";
-
 function _resolve_htmlcolor($color) {
 	$htmlcolors = array ("aliceblue" => "#f0f8ff",
 		"antiquewhite" => "#faebd7",
@@ -286,18 +284,7 @@ function hsl2rgb($arr) {
 
 		$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));
-		}
+	   $img = @imagecreatefromstring(file_get_contents($imageFile));
 
 		if (!$img) return false;
 
-- 
cgit v1.2.3


From 4fe9327491ed11661449062e4d476fdc8d8875ab Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 23:22:32 +0400
Subject: Revert "remove floIcon: bugs"

This reverts commit 7970c0925505ba1bd3b3dd15a45bebf2e839f5cf.
---
 include/colors.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/colors.php b/include/colors.php
index 9e4429a78..1359b9e2d 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",
@@ -284,7 +286,18 @@ function hsl2rgb($arr) {
 
 		$size = @getimagesize($imageFile);
 
-	   $img = @imagecreatefromstring(file_get_contents($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;
 
-- 
cgit v1.2.3


From 7a51032cab095dec5d1729a1fd8482f25970fdc7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 01:26:55 +0400
Subject: errorhandler: do not report hidden errors

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

(limited to 'include')

diff --git a/include/errorhandler.php b/include/errorhandler.php
index bb60592b7..d5674826d 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -6,6 +6,8 @@ require_once "classes/logger/sql.php";
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
 	global $logger;
 
+	if (error_reporting() == 0) return false;
+
 	if (!$logger) $logger = new Logger_SQL();
 
 	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
-- 
cgit v1.2.3


From 77be1217e5e559b6f972afc4d5506426692d50fe Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 08:32:45 +0400
Subject: errorhandler: remove unneeded stuff

---
 include/errorhandler.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/errorhandler.php b/include/errorhandler.php
index d5674826d..f7fadc172 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -22,15 +22,10 @@ function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
 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"];
+		$errno = $error["type"];
 		$file = $error["file"];
 		$line = $error["line"];
 		$errstr  = $error["message"];
-- 
cgit v1.2.3


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 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

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) {
-- 
cgit v1.2.3


From 857efe49e653787f5408fc014ae71efec68494d5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 12:10:35 +0400
Subject: add schema checking to feed updating and update script

---
 include/rssfuncs.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 0a20f5d8e..9ea2662fc 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -60,6 +60,12 @@
 	function update_daemon_common($link, $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);
+
+		if ($schema_version != SCHEMA_VERSION) {
+			die("Schema version is wrong, please upgrade the database.\n");
+		}
+
 		define('PREFS_NO_CACHE', true);
 
 		// Test if the user has loggued in recently. If not, it does not update its feeds.
-- 
cgit v1.2.3


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

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

(limited to 'include')

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) {
-- 
cgit v1.2.3


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

---
 include/autoload.php     |  12 +++++
 include/db.php           | 114 +++++------------------------------------------
 include/errorhandler.php |   8 ++--
 include/functions.php    |  11 -----
 include/sessions.php     |  90 +++++++++++--------------------------
 5 files changed, 51 insertions(+), 184 deletions(-)
 create mode 100644 include/autoload.php

(limited to 'include')

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')) {
-- 
cgit v1.2.3


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

---
 include/errorhandler.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 45496b18b..b1a0d3d0c 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;
@@ -37,11 +37,16 @@ function ttrss_fatal_handler() {
 		if (!$logger) $logger = new Logger_SQL();
 
 		if ($logger) {
-			$logger->log_error($errno, $errstr, $file, $line, $context);
+			if ($logger->log_error($errno, $errstr, $file, $line, $context)) {
+				return true;
+			}
 		}
+		return false;
 	}
+
+	return false;
 }
 
-//register_shutdown_function('ttrss_fatal_handler');
-//set_error_handler('ttrss_error_handler');
+register_shutdown_function('ttrss_fatal_handler');
+set_error_handler('ttrss_error_handler');
 ?>
-- 
cgit v1.2.3


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

---
 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 +-
 10 files changed, 502 insertions(+), 506 deletions(-)

(limited to 'include')

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


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

---
 include/db.php           | 8 --------
 include/errorhandler.php | 4 +++-
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/db.php b/include/db.php
index 11e7312ad..72c78474a 100644
--- a/include/db.php
+++ b/include/db.php
@@ -1,9 +1,5 @@
 <?php
 
-function db_connect($host, $user, $pass, $db) {
-	return Db::get()->connect($host, $user, $pass, $db, 0);
-}
-
 function db_escape_string( $s, $strip_tags = true) {
 	return Db::get()->escape_string($s, $strip_tags);
 }
@@ -25,10 +21,6 @@ function db_fetch_result($result, $row, $param) {
 	return Db::get()->fetch_result($result, $row, $param);
 }
 
-function db_close() {
-	return Db::get()->close();
-}
-
 function db_affected_rows( $result) {
 	return Db::get()->affected_rows($result);
 }
diff --git a/include/errorhandler.php b/include/errorhandler.php
index b1a0d3d0c..2c8d35f83 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -6,7 +6,7 @@ require_once "classes/logger/sql.php";
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
 	global $logger;
 
-	if (error_reporting() == 0) return false;
+	if (error_reporting() == 0 || !$errno) return false;
 
 	if (!$logger) $logger = new Logger_SQL();
 
@@ -30,6 +30,8 @@ function ttrss_fatal_handler() {
 		$line = $error["line"];
 		$errstr  = $error["message"];
 
+		if (!$errno) return false;
+
 		$context = debug_backtrace();
 
 		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
-- 
cgit v1.2.3


From 7440a7fe3c43644cc3a90fe94e7c23795f04eeba Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 18:19:26 +0400
Subject: daemon2: use passthrough to daemon-loop

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 14f4f0b78..ba2890669 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -337,7 +337,7 @@
 			}
 		}
 
-		$pluginhost = new PluginHost();
+		$pluginhost = new PluginHost(Db::get());
 		$pluginhost->set_debug($debug_enabled);
 		$user_plugins = get_pref( "_ENABLED_PLUGINS", $owner_uid);
 
-- 
cgit v1.2.3


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

---
 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 +-
 11 files changed, 443 insertions(+), 443 deletions(-)

(limited to 'include')

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'); ?>
-- 
cgit v1.2.3


From 48cb253625370aead169be64fbf6b8f025f0fbbc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 19:25:15 +0400
Subject: get_article_filter: fix missing argument

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index bebc1c1f9..537a4c338 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -595,6 +595,7 @@
 				}
 
 				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]...");
 				}
@@ -1284,7 +1285,7 @@
 		return $params;
 	}
 
-	function get_article_filters($filters, $title, $content,  $timestamp, $author, $tags) {
+	function get_article_filters($filters, $title, $content, $link, $timestamp, $author, $tags) {
 		$matches = array();
 
 		foreach ($filters as $filter) {
-- 
cgit v1.2.3


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

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

(limited to 'include')

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 2c8d35f83..6b64d5161 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -49,6 +49,6 @@ function ttrss_fatal_handler() {
 	return false;
 }
 
-register_shutdown_function('ttrss_fatal_handler');
-set_error_handler('ttrss_error_handler');
+//register_shutdown_function('ttrss_fatal_handler');
+//set_error_handler('ttrss_error_handler');
 ?>
-- 
cgit v1.2.3


From 95a10c12259cf4e76d8ee95238fccd7589de7a7a Mon Sep 17 00:00:00 2001
From: Matthias Wirtz <matthias.wirtz@hotmail.de>
Date: Wed, 17 Apr 2013 19:23:52 +0200
Subject: fixed sanity check (mysqli_connect is also allowed now)

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

(limited to 'include')

diff --git a/include/sanity_check.php b/include/sanity_check.php
index a5c682be8..b2888b1d7 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -118,7 +118,7 @@
 				array_push($errors, "PHP support for JSON is required, but was not found.");
 			}
 
-			if (DB_TYPE == "mysql" && !function_exists("mysql_connect")) {
+			if (DB_TYPE == "mysql" && !function_exists("mysql_connect") && !function_exists("mysqli_connect")) {
 				array_push($errors, "PHP support for MySQL is required for configured DB_TYPE in config.php.");
 			}
 
-- 
cgit v1.2.3


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

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


From 7329ab2dd571f79c69134c6a50d505b18546e103 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 18 Apr 2013 00:22:34 +0400
Subject: enable errorhandler

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

(limited to 'include')

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 6b64d5161..2c8d35f83 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -49,6 +49,6 @@ function ttrss_fatal_handler() {
 	return false;
 }
 
-//register_shutdown_function('ttrss_fatal_handler');
-//set_error_handler('ttrss_error_handler');
+register_shutdown_function('ttrss_fatal_handler');
+set_error_handler('ttrss_error_handler');
 ?>
-- 
cgit v1.2.3


From aea03558bb7c0ac0015a1f1e41c5f5eb1722132e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 09:15:55 +0400
Subject: do automatic gzcdecode on feed data

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 537a4c338..d4b6e26ea 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -308,6 +308,8 @@
 					_debug("update_rss_feed: fetch done.");
 				}
 
+				$feed_data = gzdecode($feed_data);
+
 			}
 
 			if (!$feed_data) {
-- 
cgit v1.2.3


From d0d86316ee5db103afcc77406e45abb26a1978ea Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 11:19:25 +0400
Subject: Revert "do automatic gzcdecode on feed data"

This reverts commit aea03558bb7c0ac0015a1f1e41c5f5eb1722132e.
---
 include/rssfuncs.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index d4b6e26ea..537a4c338 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -308,8 +308,6 @@
 					_debug("update_rss_feed: fetch done.");
 				}
 
-				$feed_data = gzdecode($feed_data);
-
 			}
 
 			if (!$feed_data) {
-- 
cgit v1.2.3


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

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


From c1e45a87b2d15dbfebb789478ce33bafcc5ee4c0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 11:38:22 +0400
Subject: db-prefs: use user_error

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

(limited to 'include')

diff --git a/include/db-prefs.php b/include/db-prefs.php
index 125f1caaa..8336b0cfe 100644
--- a/include/db-prefs.php
+++ b/include/db-prefs.php
@@ -97,7 +97,7 @@
 
 		} else {
 			if ($die_on_error) {
-				die("Fatal error, unknown preferences key: $pref_name");
+				user_error("Fatal error, unknown preferences key: $pref_name", E_USER_ERROR);
 			} else {
 				return null;
 			}
-- 
cgit v1.2.3


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

---
 include/db-prefs.php  | 179 +-------------------------------------------------
 include/functions.php |   4 --
 include/rssfuncs.php  |   2 -
 3 files changed, 2 insertions(+), 183 deletions(-)

(limited to 'include')

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


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

---
 include/functions.php | 65 +++++++++++++++++----------------------------------
 include/rssfuncs.php  | 12 +++++-----
 2 files changed, 28 insertions(+), 49 deletions(-)

(limited to 'include')

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


From 073672ccd50d76800b5c2489cea9105aec8957eb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 14:41:30 +0400
Subject: add _DISABLE_FLOICON

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

(limited to 'include')

diff --git a/include/colors.php b/include/colors.php
index b20c34c41..7cf1a6af0 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -286,7 +286,7 @@ function hsl2rgb($arr) {
 
 		$size = @getimagesize($imageFile);
 
-		if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
+		if (!defined('_DISABLE_FLOICON') && strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
 			$ico = new floIcon();
 			@$ico->readICO($imageFile);
 
-- 
cgit v1.2.3


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 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

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) {
-- 
cgit v1.2.3


From ce2b219c64df3a84bacea2aecf05cc2e96aa0d59 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 16:25:02 +0400
Subject: entry_author: do not double escape string, author & comments: trim

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 9c80a72d6..079471b4d 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -583,14 +583,12 @@
 					$entry_author_item = $item->get_author();
 					$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_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(trim($entry_comments), 0, 245));
+				$entry_author = db_escape_string(mb_substr(trim($entry_author), 0, 245));
 
 				$num_comments = $item->get_item_tags('http://purl.org/rss/1.0/modules/slash/', 'comments');
 
-- 
cgit v1.2.3


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

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

(limited to 'include')

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) {
-- 
cgit v1.2.3


From 7f1113a56ad8e66ce3dd9886b4b11dfc30573c7f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 22:36:16 +0400
Subject: _DISABLE_FLOICON -> _ENABLE_FLOICON

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

(limited to 'include')

diff --git a/include/colors.php b/include/colors.php
index 7cf1a6af0..a9f633ef4 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -286,7 +286,7 @@ function hsl2rgb($arr) {
 
 		$size = @getimagesize($imageFile);
 
-		if (!defined('_DISABLE_FLOICON') && strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
+		if (defined('_ENABLE_FLOICON') && strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
 			$ico = new floIcon();
 			@$ico->readICO($imageFile);
 
-- 
cgit v1.2.3


From 96db9a14d983bd48c38d9d84ba62d014fb00dc19 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 08:42:35 +0400
Subject: do not try to calculate icon avg color if GD is not present

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 079471b4d..8ffcbde8a 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -424,7 +424,7 @@
 				check_feed_favicon($site_url, $feed, $link);
 				$favicon_file = ICONS_DIR . "/$feed.ico";
 
-				if (file_exists($favicon_file)) {
+				if (file_exists($favicon_file) && function_exists("imagecreatefromstring")) {
 						require_once "colors.php";
 
 						$favicon_color = db_escape_string(
-- 
cgit v1.2.3


From f1c6dd7e90d43b36417b33907ffe96b56b95f27c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 08:43:11 +0400
Subject: Revert "_DISABLE_FLOICON -> _ENABLE_FLOICON"

This reverts commit 7f1113a56ad8e66ce3dd9886b4b11dfc30573c7f.
---
 include/colors.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/colors.php b/include/colors.php
index a9f633ef4..7cf1a6af0 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -286,7 +286,7 @@ function hsl2rgb($arr) {
 
 		$size = @getimagesize($imageFile);
 
-		if (defined('_ENABLE_FLOICON') && strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
+		if (!defined('_DISABLE_FLOICON') && strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
 			$ico = new floIcon();
 			@$ico->readICO($imageFile);
 
-- 
cgit v1.2.3


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

---
 include/errorhandler.php  | 21 ++-------------------
 include/sanity_config.php |  4 ++--
 2 files changed, 4 insertions(+), 21 deletions(-)

(limited to 'include')

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 2c8d35f83..9acef2357 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -1,22 +1,12 @@
 <?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 (error_reporting() == 0 || !$errno) return false;
 
-	if (!$logger) $logger = new Logger_SQL();
-
 	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-	if ($logger) {
-		return $logger->log_error($errno, $errstr, $file, $line, $context);
-	}
-
-	return false;
+	return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
 }
 
 function ttrss_fatal_handler() {
@@ -36,14 +26,7 @@ function ttrss_fatal_handler() {
 
 		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-		if (!$logger) $logger = new Logger_SQL();
-
-		if ($logger) {
-			if ($logger->log_error($errno, $errstr, $file, $line, $context)) {
-				return true;
-			}
-		}
-		return false;
+		return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
 	}
 
 	return false;
diff --git a/include/sanity_config.php b/include/sanity_config.php
index d5cfd2d78..7d8afe102 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
+<?php # This file has been generated at:  Fri Apr 19 09:22:33 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', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?>
-- 
cgit v1.2.3


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

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


From 1367bc3f5e0f99f5b900bcd3ea9e7512b7c84388 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 12:35:30 +0400
Subject: trim received feed data on fetch

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 8ffcbde8a..31d35bf8e 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -310,6 +310,8 @@
 					if ($tmp) $feed_data = $tmp;
 				}
 
+				$feed_data = trim($feed_data);
+
 				if ($debug_enabled) {
 					_debug("update_rss_feed: fetch done.");
 				}
-- 
cgit v1.2.3


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 ++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

(limited to 'include')

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;
+	}
 
 ?>
-- 
cgit v1.2.3


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

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


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

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


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

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


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

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


From 1134497129597b71ff62b4fb223b2088dc7b0510 Mon Sep 17 00:00:00 2001
From: Daniel Andersson <sskraep@gmail.com>
Date: Fri, 19 Apr 2013 21:25:26 +0200
Subject: Fix doubly applied basepaths to lockfiles.

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 6ccf520af..2be791cb7 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1159,7 +1159,7 @@
 
 			if ($files) {
 				foreach ($files as $file) {
-					if (!file_is_locked($file) && time() - filemtime($file) > 86400*2) {
+					if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400*2) {
 						unlink($file);
 						++$num_deleted;
 					}
-- 
cgit v1.2.3


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

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


From 6316898f8de2c5163fef32105427416cedb13fee Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 23 Apr 2013 20:22:55 +0400
Subject: special version reporting for git

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

(limited to 'include')

diff --git a/include/version.php b/include/version.php
index 61851dffb..07b6c4a00 100644
--- a/include/version.php
+++ b/include/version.php
@@ -1,3 +1,18 @@
 <?php
-	define('VERSION', "1.7.8");
+	define('VERSION_STATIC', '1.7.8');
+
+	function get_version() {
+		$root_dir = dirname(dirname(__FILE__));
+
+		if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/ORIG_HEAD")) {
+
+			$suffix = date("Ymd", filemtime("$root_dir/.git/ORIG_HEAD"));
+
+			return VERSION_STATIC . ".$suffix";
+		} else {
+			return VERSION_STATIC;
+		}
+	}
+
+	define('VERSION', get_version());
 ?>
-- 
cgit v1.2.3


From 3921f5081bcb37df4bdf951ebb5fe2a14a88791f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 23 Apr 2013 22:19:09 +0400
Subject: only show reset password link when auth_internal is enabled (refs
 #681)

---
 include/login_form.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/login_form.php b/include/login_form.php
index 7ac7111c8..4745027f9 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -188,6 +188,8 @@ function bwLimitChange(elem) {
 				value="<?php echo $_SESSION["fake_login"] ?>" />
 		</div>
 
+		<?php if (strpos(PLUGINS, "auth_internal") !== FALSE) { ?>
+
 		<div class="row">
 			<label><?php echo __("Password:") ?></label>
 			<input type="password" name="password" required="1"
@@ -197,6 +199,8 @@ function bwLimitChange(elem) {
 			<a class='forgotpass' href="public.php?op=forgotpass"><?php echo __("I forgot my password") ?></a>
 		</div>
 
+		<?php } ?>
+
 		<div class="row">
 			<label><?php echo __("Language:") ?></label>
 			<?php
-- 
cgit v1.2.3


From 36490f11a3d7bf42e3725d4bb0884f3d0e49e4d8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 23 Apr 2013 22:30:06 +0400
Subject: add a hack so that if floicon fails on some icon, it won't be
 processed again

---
 include/rssfuncs.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 2be791cb7..8bc5fcbd8 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -399,7 +399,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_avg_color,
 				(favicon_last_checked IS NULL OR $favicon_interval_qpart) AS
 						favicon_needs_check
 				FROM ttrss_feeds WHERE id = '$feed'");
@@ -408,24 +408,34 @@
 			$orig_site_url = db_fetch_result($result, 0, "site_url");
 			$favicon_needs_check = sql_bool_to_bool(db_fetch_result($result, 0,
 				"favicon_needs_check"));
+			$favicon_avg_color = db_fetch_result($result, 0, "favicon_avg_color");
 
 			$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));
 
 			if ($favicon_needs_check || $force_refetch) {
+
+				/* terrible hack: if we crash on floicon shit here, we won't check
+				 * the icon avgcolor again */
+
+				db_query("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
+					id = '$feed'");
+
 				_debug("checking favicon...", $debug_enabled);
 
 				check_feed_favicon($site_url, $feed, $link);
 				$favicon_file = ICONS_DIR . "/$feed.ico";
 
-				if (file_exists($favicon_file) && function_exists("imagecreatefromstring")) {
+				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color != 'fail') {
 						require_once "colors.php";
 
 						$favicon_color = db_escape_string(
 							calculate_avg_color($favicon_file));
 
 						$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
+				} else if ($favicon_avg_color == 'fail') {
+					_debug("floicon failed on this file, not trying to recalculate avg color");
 				}
 
 				db_query("UPDATE ttrss_feeds SET favicon_last_checked = NOW()
-- 
cgit v1.2.3


From 560cbd8c0dc1bdd7418c2e259d80c78281039769 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 23 Apr 2013 22:33:23 +0400
Subject: attempt to recalculate favicon avg color if it changes

---
 include/rssfuncs.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 8bc5fcbd8..bc054ca52 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -417,15 +417,21 @@
 			if ($favicon_needs_check || $force_refetch) {
 
 				/* terrible hack: if we crash on floicon shit here, we won't check
-				 * the icon avgcolor again */
+				 * the icon avgcolor again (unless the icon got updated) */
 
 				db_query("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
 					id = '$feed'");
 
+				$favicon_file = ICONS_DIR . "/$feed.ico";
+				$favicon_modified = @filemtime($favicon_file);
+
 				_debug("checking favicon...", $debug_enabled);
 
 				check_feed_favicon($site_url, $feed, $link);
-				$favicon_file = ICONS_DIR . "/$feed.ico";
+				$favicon_modified_new = @filemtime($favicon_file);
+
+				if ($favicon_modified_new > $favicon_modified)
+					$favicon_avg_color = '';
 
 				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color != 'fail') {
 						require_once "colors.php";
-- 
cgit v1.2.3


From 6ee0d4b05c2f159aa828274f2f4e0f5548d1890e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 23 Apr 2013 22:37:06 +0400
Subject: do not recalculate avg color repeatedly

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index bc054ca52..870d77203 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -433,7 +433,7 @@
 				if ($favicon_modified_new > $favicon_modified)
 					$favicon_avg_color = '';
 
-				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color != 'fail') {
+				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
 						require_once "colors.php";
 
 						$favicon_color = db_escape_string(
-- 
cgit v1.2.3


From 50d4b30b338bae62fd3eb8692ba6b9b6e8e53f26 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 08:56:37 +0400
Subject: get_version: force UTC

---
 include/version.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/version.php b/include/version.php
index 07b6c4a00..4d088a2bb 100644
--- a/include/version.php
+++ b/include/version.php
@@ -2,6 +2,7 @@
 	define('VERSION_STATIC', '1.7.8');
 
 	function get_version() {
+		date_default_timezone_set('UTC');
 		$root_dir = dirname(dirname(__FILE__));
 
 		if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/ORIG_HEAD")) {
-- 
cgit v1.2.3


From 48c1d0c71bf81c1958baf6ed8d9169f5462d2e24 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 09:05:56 +0400
Subject: autoload: include functions.php

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

(limited to 'include')

diff --git a/include/autoload.php b/include/autoload.php
index 40c63d547..505b44477 100644
--- a/include/autoload.php
+++ b/include/autoload.php
@@ -1,4 +1,6 @@
 <?php
+	require_once "functions.php";
+
 	function __autoload($class) {
 		$class_file = str_replace("_", "/", strtolower(basename($class)));
 
-- 
cgit v1.2.3


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

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


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

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


From fce451a4f796e8ccafc9aec692cb8821c085fc97 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 13:43:40 +0400
Subject: fix updating for pgsql increase default batch size remove random
 check between feedbrowser or update task executing

---
 include/rssfuncs.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index e9b9c7142..ac00a9408 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1,7 +1,7 @@
 <?php
-	define('DAEMON_UPDATE_LOGIN_LIMIT', 30);
-	define('DAEMON_FEED_LIMIT', 100);
-	define('DAEMON_SLEEP_INTERVAL', 60);
+	define_default('DAEMON_UPDATE_LOGIN_LIMIT', 30);
+	define_default('DAEMON_FEED_LIMIT', 500);
+	define_default('DAEMON_SLEEP_INTERVAL', 60);
 
 	function update_feedbrowser_cache() {
 
@@ -113,8 +113,7 @@
 		$query_limit = "";
 		if($limit) $query_limit = sprintf("LIMIT %d", $limit);
 
-		// We search for feed needing update.
-		$result = db_query("SELECT DISTINCT ttrss_feeds.feed_url
+		$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -123,7 +122,10 @@
 				AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
 				$login_thresh_qpart $update_limit_qpart
 				$updstart_thresh_qpart
-			ORDER BY last_updated $query_limit");
+				ORDER BY last_updated $query_limit";
+
+		// We search for feed needing update.
+		$result = db_query($query);
 
 		if($debug) _debug(sprintf("Scheduled %d feeds to update...", db_num_rows($result)));
 
-- 
cgit v1.2.3


From 8cabc200d5f50327641c6c3ee615095f632afd87 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 14:15:46 +0400
Subject: increase updstart locking interval to prevent concurrent updates;
 decrease batch size for the daemon

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index ac00a9408..f4fa18dc9 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -104,9 +104,9 @@
 
 		// Test if feed is currently being updated by another process.
 		if (DB_TYPE == "pgsql") {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '5 minutes')";
+			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '10 minutes')";
 		} else {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))";
+			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
 		}
 
 		// Test if there is a limit to number of updated feeds
-- 
cgit v1.2.3


From 654650857ffc3e4914c9655528e1037939f75f54 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 14:26:03 +0400
Subject: reduce daemon chattiness a bit

---
 include/rssfuncs.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index f4fa18dc9..48638f57e 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1169,7 +1169,7 @@
 	}
 
 	function expire_lock_files($debug) {
-		if ($debug) _debug("Removing old lock files...");
+		//if ($debug) _debug("Removing old lock files...");
 
 		$num_deleted = 0;
 
@@ -1186,14 +1186,14 @@
 			}
 		}
 
-		if ($debug) _debug("Removed $num_deleted files.");
+		if ($debug) _debug("Removed $num_deleted old lock files.");
 	}
 
 	function expire_cached_files($debug) {
 		foreach (array("simplepie", "images", "export", "upload") as $dir) {
 			$cache_dir = CACHE_DIR . "/$dir";
 
-			if ($debug) _debug("Expiring $cache_dir");
+//			if ($debug) _debug("Expiring $cache_dir");
 
 			$num_deleted = 0;
 
@@ -1211,7 +1211,7 @@
 				}
 			}
 
-			if ($debug) _debug("Removed $num_deleted files.");
+			if ($debug) _debug("$cache_dir: removed $num_deleted files.");
 		}
 	}
 
-- 
cgit v1.2.3


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

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

(limited to 'include')

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.");
+	}
 ?>
-- 
cgit v1.2.3


From 84ceb6bd2eb0257a1cc863ff40120a694fa51b79 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 16:48:47 +0400
Subject: fix floicon failed message not respecting debugging setting

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index a64d60e1e..6bb841c50 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -440,7 +440,7 @@
 
 						$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
 				} else if ($favicon_avg_color == 'fail') {
-					_debug("floicon failed on this file, not trying to recalculate avg color");
+					_debug("floicon failed on this file, not trying to recalculate avg color", $debug_enabled);
 				}
 
 				db_query("UPDATE ttrss_feeds SET favicon_last_checked = NOW()
-- 
cgit v1.2.3


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

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


From aafd55bab612a78816f0e91b7c8bfec1d3746f32 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 19:01:51 +0400
Subject: do not needlessly mark icons as failed

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 6bb841c50..f806d4807 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -418,9 +418,6 @@
 				/* terrible hack: if we crash on floicon shit here, we won't check
 				 * the icon avgcolor again (unless the icon got updated) */
 
-				db_query("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
-					id = '$feed'");
-
 				$favicon_file = ICONS_DIR . "/$feed.ico";
 				$favicon_modified = @filemtime($favicon_file);
 
@@ -435,6 +432,9 @@
 				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
 						require_once "colors.php";
 
+						db_query("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
+							id = '$feed'");
+
 						$favicon_color = db_escape_string(
 							calculate_avg_color($favicon_file));
 
-- 
cgit v1.2.3


From a62337b35dc5e1fe97f60346f632cb403a3677ab Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 24 Apr 2013 19:13:11 +0400
Subject: login: add tooltip for bw_limit

---
 include/login_form.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/login_form.php b/include/login_form.php
index 4745027f9..9a20e9be9 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -222,7 +222,11 @@ function bwLimitChange(elem) {
 			<label>&nbsp;</label>
 			<input dojoType="dijit.form.CheckBox" name="bw_limit" id="bw_limit" type="checkbox"
 				onchange="bwLimitChange(this)">
-			<label style='display : inline' for="bw_limit"><?php echo __("Use less traffic") ?></label>
+			<label id="bw_limit_label" style='display : inline' for="bw_limit"><?php echo __("Use less traffic") ?></label>
+		</div>
+
+		<div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below">
+<?php echo __("Does not display images in articles, reduces automatic refreshes."); ?>
 		</div>
 
 		<?php if (SESSION_COOKIE_LIFETIME > 0) { ?>
-- 
cgit v1.2.3


From 23283f11a33fc1e93f6adf1d6ee506a6bb579eb4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 25 Apr 2013 16:12:49 +0400
Subject: fetch: better checking for 1970- date

---
 include/rssfuncs.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index f806d4807..dbe76d2d3 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -241,8 +241,7 @@
 		$cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".feed";
 
 		// 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;
+		$cache_age = ($no_cache || is_null($last_updated) || strpos($last_updated, '1970-01-01') === 0) ? 30 : get_feed_update_interval($feed) * 60;
 
 		_debug("cache filename: $cache_filename exists: " . file_exists($cache_filename), $debug_enabled);
 		_debug("cache age: $cache_age; no cache: $no_cache", $debug_enabled);
-- 
cgit v1.2.3


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

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

(limited to 'include')

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


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

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

(limited to 'include')

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


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

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


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

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


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)

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

(limited to 'include')

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


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

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


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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

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


From ffa1bd7b19d6941d12f66a477c0b5cec44ef4857 Mon Sep 17 00:00:00 2001
From: Dmitry Konishchev <konishchev@gmail.com>
Date: Fri, 26 Apr 2013 15:46:48 +0400
Subject: Allow slashes in filter regular expressions

User's regular expressions need escaping before passing them to
preg_match()
---
 include/rssfuncs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 0cd41dc05..3c7716721 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1242,7 +1242,7 @@
 
 			foreach ($filter["rules"] as $rule) {
 				$match = false;
-				$reg_exp = $rule["reg_exp"];
+				$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
 				$rule_inverse = $rule["inverse"];
 
 				if (!$reg_exp)
-- 
cgit v1.2.3


From 7b80b5e1600f9b0ffda7da6fcb717223b31a310d Mon Sep 17 00:00:00 2001
From: Dmitry Konishchev <konishchev@gmail.com>
Date: Fri, 26 Apr 2013 15:54:04 +0400
Subject: Match each tag separately against user filter regular expression

Each article's tag should be matched against user filter regular
expression separately. Current matching confuses when you want to match
an exact tag. You suppose to write "^tag$", bug now have to write
"(^|,)tag(,|$)" which is very inconvenient and requires knowledge about
how do you process this matching.
---
 include/rssfuncs.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 0cd41dc05..f4f9fa53c 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1271,8 +1271,12 @@
 					$match = @preg_match("/$reg_exp/i", $author);
 					break;
 				case "tag":
-					$tag_string = join(",", $tags);
-					$match = @preg_match("/$reg_exp/i", $tag_string);
+					foreach ($tags as $tag) {
+						if (@preg_match("/$reg_exp/i", $tag)) {
+							$match = true;
+							break;
+						}
+					}
 					break;
 				}
 
-- 
cgit v1.2.3


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

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


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

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


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

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

(limited to 'include')

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


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

---
 include/functions.php  | 19 +++++++------------
 include/login_form.php |  8 --------
 2 files changed, 7 insertions(+), 20 deletions(-)

(limited to 'include')

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>
 
-- 
cgit v1.2.3


From 39ede9862f1df94b24cbe476ec66eca99a1d1a2f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 29 Apr 2013 16:59:36 +0400
Subject: experimental: decode numerical utf entities on import in entry title

---
 include/rssfuncs.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 0ecab6a25..a5d3898ce 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -553,6 +553,7 @@
 				_debug("date $entry_timestamp [$entry_timestamp_fmt]", $debug_enabled);
 
 				$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
+				$entry_title = decode_numeric_entities($entry_title);
 
 				$entry_link = rewrite_relative_url($site_url, $item->get_link());
 
@@ -1388,4 +1389,15 @@
 
 		_debug("Cleaned $rc cached tags.");
 	}
+
+	function utf8_entity_decode($entity){
+		$convmap = array(0x0, 0x10000, 0, 0xfffff);
+		return mb_decode_numericentity($entity, $convmap, 'UTF-8');
+	}
+
+	function decode_numeric_entities($body) {
+		$body = preg_replace('/&#\d{2,5};/ue', "utf8_entity_decode('$0')", $body );
+		$body = preg_replace('/&#x([a-fA-F0-7]{2,8});/ue', "utf8_entity_decode('&#'.hexdec('$1').';')", $body );
+		return $body;
+	}
 ?>
-- 
cgit v1.2.3


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

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

(limited to 'include')

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


From d571740b33994a8faa5290b63d1c8b68f16e7686 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 15:24:30 +0400
Subject: ccache: do not force recalculate child counters on category upgrade
 because this is handled elsewhere

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

(limited to 'include')

diff --git a/include/ccache.php b/include/ccache.php
index d89b9efe0..c33165ef8 100644
--- a/include/ccache.php
+++ b/include/ccache.php
@@ -127,12 +127,12 @@
 
 			/* 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);
-			}
+			} */
 
 			$result = db_query("SELECT SUM(value) AS sv
 				FROM ttrss_counters_cache, ttrss_feeds
-- 
cgit v1.2.3


From 65c8d5e76dace4fffa1565c87393f662d7c5cdbe Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 15:43:56 +0400
Subject: update: set last_updated to now() when process starts

---
 include/rssfuncs.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index a5d3898ce..08bf1fe6d 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -212,6 +212,10 @@
 			return false;
 		}
 
+		// set last update to now so if anything *simplepie* crashes later we won't be
+		// continuously failing on the same feed
+		db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'");
+
 		$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");
-- 
cgit v1.2.3


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

---
 include/rssfuncs.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 08bf1fe6d..3b7f7d2cf 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -361,16 +361,17 @@
 		}
 
 		if (!$rss) {
-			$rss = new SimplePie();
+			/* $rss = new SimplePie();
 			$rss->set_sanitize_class("SanitizeDummy");
 			// simplepie ignores the above and creates default sanitizer anyway,
 			// so let's override it...
 			$rss->sanitize = new SanitizeDummy();
 			$rss->set_output_encoding('UTF-8');
 			$rss->set_raw_data($feed_data);
-			$rss->enable_cache(false);
+			$rss->enable_cache(false); */
 
-			@$rss->init();
+			$rss = new FeedParser($feed_data);
+			$rss->init();
 		}
 
 //		print_r($rss);
@@ -386,7 +387,7 @@
 
 				if ($new_rss_hash != $rss_hash) {
 					_debug("saving $cache_filename", $debug_enabled);
-					@file_put_contents($cache_filename, serialize($rss));
+					//@file_put_contents($cache_filename, serialize($rss)); NOT YET
 				}
 			}
 
@@ -418,6 +419,9 @@
 
 			$site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
 
+			_debug("site_url: $site_url", $debug_enabled);
+			_debug("feed_title: " . $rss->get_title(), $debug_enabled);
+
 			if ($favicon_needs_check || $force_refetch) {
 
 				/* terrible hack: if we crash on floicon shit here, we won't check
@@ -533,6 +537,8 @@
 				if (!$entry_guid) $entry_guid = $item->get_link();
 				if (!$entry_guid) $entry_guid = make_guid_from_title($item->get_title());
 
+				_debug("f_guid $entry_guid", $debug_enabled);
+
 				if (!$entry_guid) continue;
 
 				$entry_guid = "$owner_uid,$entry_guid";
@@ -575,20 +581,15 @@
 					print "\n";
 				}
 
-				$entry_comments = $item->data["comments"];
-
-				if ($item->get_author()) {
-					$entry_author_item = $item->get_author();
-					$entry_author = $entry_author_item->get_name();
-					if (!$entry_author) $entry_author = $entry_author_item->get_email();
-				}
+				$entry_comments = $item->get_comments_url();
+				$entry_author = $item->get_author();
 
 				$entry_guid = db_escape_string(mb_substr($entry_guid, 0, 245));
 
 				$entry_comments = db_escape_string(mb_substr(trim($entry_comments), 0, 245));
 				$entry_author = db_escape_string(mb_substr(trim($entry_author), 0, 245));
 
-				$num_comments = $item->get_item_tags('http://purl.org/rss/1.0/modules/slash/', 'comments');
+				$num_comments = $item->get_comments_count();
 
 				if (is_array($num_comments) && is_array($num_comments[0])) {
 					$num_comments = (int) $num_comments[0]["data"];
@@ -608,7 +609,7 @@
 
 				if (is_array($additional_tags_src)) {
 					foreach ($additional_tags_src as $tobj) {
-						array_push($additional_tags, $tobj->get_term());
+						array_push($additional_tags, $tobj);
 					}
 				}
 
-- 
cgit v1.2.3


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

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 3b7f7d2cf..ec0ca5a4f 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -549,7 +549,9 @@
 
 				$entry_timestamp = "";
 
-				$entry_timestamp = strtotime($item->get_date());
+				$entry_timestamp = $item->get_date();
+
+				_debug("orig date: " . $item->get_date(), $debug_enabled);
 
 				if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
 					$entry_timestamp = time();
-- 
cgit v1.2.3


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

---
 include/rssfuncs.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index ec0ca5a4f..21040e5a7 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -245,7 +245,7 @@
 
 		$date_feed_processed = date('Y-m-d H:i');
 
-		$cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".feed";
+		$cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".feed2";
 
 		// Ignore cache if new feed or manual update.
 		$cache_age = ($no_cache || is_null($last_updated) || strpos($last_updated, '1970-01-01') === 0) ? 30 : get_feed_update_interval($feed) * 60;
@@ -269,11 +269,10 @@
 				_debug("using local cache.", $debug_enabled);
 
 				if ($cache_timestamp > $last_article_timestamp) {
-					@$rss_data = file_get_contents($cache_filename);
+					@$feed_data = file_get_contents($cache_filename);
 
-					if ($rss_data) {
-						$rss_hash = sha1($rss_data);
-						@$rss = unserialize($rss_data);
+					if ($feed_data) {
+						$rss_hash = sha1($feed_data);
 					}
 				} else if (!$force_refetch) {
 					_debug("local cache valid and older than last_updated, nothing to do.", $debug_enabled);
@@ -385,9 +384,9 @@
 				$rss_data = serialize($rss);
 				$new_rss_hash = sha1($rss_data);
 
-				if ($new_rss_hash != $rss_hash) {
+				if ($new_rss_hash != $rss_hash && count($rss->get_items()) > 0 ) {
 					_debug("saving $cache_filename", $debug_enabled);
-					//@file_put_contents($cache_filename, serialize($rss)); NOT YET
+					@file_put_contents($cache_filename, $rss_data);
 				}
 			}
 
-- 
cgit v1.2.3


From 99429e57e45c6bf2312243b57d64a56c8ccd7af2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 1 May 2013 18:06:53 +0400
Subject: remove simplepie entity decode hacks

---
 include/rssfuncs.php | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 21040e5a7..9148cc0e0 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -563,8 +563,9 @@
 
 				_debug("date $entry_timestamp [$entry_timestamp_fmt]", $debug_enabled);
 
-				$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
-				$entry_title = decode_numeric_entities($entry_title);
+//				$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
+//				$entry_title = decode_numeric_entities($entry_title);
+				$entry_title = $item->get_title();
 
 				$entry_link = rewrite_relative_url($site_url, $item->get_link());
 
@@ -1395,15 +1396,4 @@
 
 		_debug("Cleaned $rc cached tags.");
 	}
-
-	function utf8_entity_decode($entity){
-		$convmap = array(0x0, 0x10000, 0, 0xfffff);
-		return mb_decode_numericentity($entity, $convmap, 'UTF-8');
-	}
-
-	function decode_numeric_entities($body) {
-		$body = preg_replace('/&#\d{2,5};/ue', "utf8_entity_decode('$0')", $body );
-		$body = preg_replace('/&#x([a-fA-F0-7]{2,8});/ue', "utf8_entity_decode('&#'.hexdec('$1').';')", $body );
-		return $body;
-	}
 ?>
-- 
cgit v1.2.3


From 431e27851bc35845c4bc207db98dae6067ca0516 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 1 May 2013 18:10:27 +0400
Subject: actually save feed xml in the cache

---
 include/rssfuncs.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 9148cc0e0..eb10a5c66 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -381,12 +381,11 @@
 
 			// cache data for later
 			if (!$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/simplepie")) {
-				$rss_data = serialize($rss);
 				$new_rss_hash = sha1($rss_data);
 
 				if ($new_rss_hash != $rss_hash && count($rss->get_items()) > 0 ) {
 					_debug("saving $cache_filename", $debug_enabled);
-					@file_put_contents($cache_filename, $rss_data);
+					@file_put_contents($cache_filename, $feed_data);
 				}
 			}
 
-- 
cgit v1.2.3


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

---
 include/rssfuncs.php | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index eb10a5c66..229154696 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -193,8 +193,6 @@
 	function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false,
 		$override_url = false) {
 
-		require_once "lib/simplepie/simplepie.inc";
-
 		$debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
 
 		_debug("start", $debug_enabled);
@@ -360,15 +358,6 @@
 		}
 
 		if (!$rss) {
-			/* $rss = new SimplePie();
-			$rss->set_sanitize_class("SanitizeDummy");
-			// simplepie ignores the above and creates default sanitizer anyway,
-			// so let's override it...
-			$rss->sanitize = new SanitizeDummy();
-			$rss->set_output_encoding('UTF-8');
-			$rss->set_raw_data($feed_data);
-			$rss->enable_cache(false); */
-
 			$rss = new FeedParser($feed_data);
 			$rss->init();
 		}
-- 
cgit v1.2.3


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

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 229154696..57e63b873 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -448,10 +448,12 @@
 
 				$feed_title = db_escape_string($rss->get_title());
 
-				_debug("registering title: $feed_title", $debug_enabled);
+				if ($feed_title) {
+					_debug("registering title: $feed_title", $debug_enabled);
 
-				db_query("UPDATE ttrss_feeds SET
-					title = '$feed_title' WHERE id = '$feed'");
+					db_query("UPDATE ttrss_feeds SET
+						title = '$feed_title' WHERE id = '$feed'");
+				}
 			}
 
 			if ($site_url && $orig_site_url != $site_url) {
-- 
cgit v1.2.3


From ee78f81ccdcc12055927a708e31ab0a85442b27b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 20:33:59 +0400
Subject: update: better tag-related debugging info

---
 include/rssfuncs.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 57e63b873..d1175a303 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -591,7 +591,7 @@
 
 				_debug("author $entry_author", $debug_enabled);
 				_debug("num_comments: $num_comments", $debug_enabled);
-				_debug("looking for tags [1]...", $debug_enabled);
+				_debug("looking for tags...", $debug_enabled);
 
 				// parse <category> entries into tags
 
@@ -605,14 +605,13 @@
 					}
 				}
 
-				_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("tags found: " . join(",", $entry_tags), $debug_enabled);
+
 				_debug("done collecting data.", $debug_enabled);
 
 				// TODO: less memory-hungry implementation
-- 
cgit v1.2.3


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

---
 include/rssfuncs.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index d1175a303..f342bf7f1 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -581,13 +581,7 @@
 				$entry_comments = db_escape_string(mb_substr(trim($entry_comments), 0, 245));
 				$entry_author = db_escape_string(mb_substr(trim($entry_author), 0, 245));
 
-				$num_comments = $item->get_comments_count();
-
-				if (is_array($num_comments) && is_array($num_comments[0])) {
-					$num_comments = (int) $num_comments[0]["data"];
-				} else {
-					$num_comments = 0;
-				}
+				$num_comments = (int) $item->get_comments_count();
 
 				_debug("author $entry_author", $debug_enabled);
 				_debug("num_comments: $num_comments", $debug_enabled);
-- 
cgit v1.2.3


From 865a3ed6a0651a7c507898e3493883b454f79eba Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 01:33:00 +0400
Subject: change feed cache file extension

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index f342bf7f1..1bbac2843 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -243,7 +243,7 @@
 
 		$date_feed_processed = date('Y-m-d H:i');
 
-		$cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".feed2";
+		$cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".xml";
 
 		// Ignore cache if new feed or manual update.
 		$cache_age = ($no_cache || is_null($last_updated) || strpos($last_updated, '1970-01-01') === 0) ? 30 : get_feed_update_interval($feed) * 60;
-- 
cgit v1.2.3


From 52637d3b30ea10715fc20f63eeb39445a725dbb5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 01:36:17 +0400
Subject: remove cache valid bailout clause

---
 include/rssfuncs.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 1bbac2843..662600332 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -264,18 +264,14 @@
 			!$auth_login && !$auth_pass &&
 			filemtime($cache_filename) > time() - $cache_age) {
 
-				_debug("using local cache.", $debug_enabled);
+			_debug("using local cache.", $debug_enabled);
 
-				if ($cache_timestamp > $last_article_timestamp) {
-					@$feed_data = file_get_contents($cache_filename);
+			@$feed_data = file_get_contents($cache_filename);
+
+			if ($feed_data) {
+				$rss_hash = sha1($feed_data);
+			}
 
-					if ($feed_data) {
-						$rss_hash = sha1($feed_data);
-					}
-				} else if (!$force_refetch) {
-					_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);
 		}
-- 
cgit v1.2.3


From 15c762beda9f02acfba5e680a10025f28b8978bc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 02:02:49 +0400
Subject: updater: show owner_uid for checked feeds

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 662600332..594c29633 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -160,7 +160,7 @@
 
 			// 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,ttrss_feeds.owner_uid
 			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
@@ -173,7 +173,7 @@
 
 			if (db_num_rows($tmp_result) > 0) {
 				while ($tline = db_fetch_assoc($tmp_result)) {
-					if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"]);
+					if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
 					update_rss_feed($tline["id"], true);
 					++$nf;
 				}
-- 
cgit v1.2.3


From 5d0d3887af6713a8b3a4d46389aa1ff2216f05f5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 02:11:11 +0400
Subject: add _DISABLE_HTTP_304

---
 include/rssfuncs.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 594c29633..2f570e37e 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -216,6 +216,10 @@
 
 		$last_updated = db_fetch_result($result, 0, "last_updated");
 		$last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp"));
+
+		if (defined('_DISABLE_HTTP_304'))
+			$last_article_timestamp = 0;
+
 		$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"));
-- 
cgit v1.2.3


From d0e9c40a5a292f909cc9a8cd3efb71be456a5e95 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 02:12:07 +0400
Subject: Revert "ccache: do not force recalculate child counters on category
 upgrade because this is handled elsewhere"

http://tt-rss.org/forum/viewtopic.php?f=10&t=1964

This reverts commit d571740b33994a8faa5290b63d1c8b68f16e7686.
---
 include/ccache.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/ccache.php b/include/ccache.php
index c33165ef8..d89b9efe0 100644
--- a/include/ccache.php
+++ b/include/ccache.php
@@ -127,12 +127,12 @@
 
 			/* 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);
-			} */
+			}
 
 			$result = db_query("SELECT SUM(value) AS sv
 				FROM ttrss_counters_cache, ttrss_feeds
-- 
cgit v1.2.3


From 5ef8409700c0d2b85f4fe2f5d3b11ea51a18a355 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 02:20:34 +0400
Subject: move the precautionary timestamp bumping

---
 include/rssfuncs.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 2f570e37e..730adc664 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -210,10 +210,6 @@
 			return false;
 		}
 
-		// set last update to now so if anything *simplepie* crashes later we won't be
-		// continuously failing on the same feed
-		db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'");
-
 		$last_updated = db_fetch_result($result, 0, "last_updated");
 		$last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp"));
 
@@ -357,6 +353,10 @@
 			$feed_data = $plugin->hook_feed_fetched($feed_data);
 		}
 
+		// set last update to now so if anything *simplepie* crashes later we won't be
+		// continuously failing on the same feed
+		db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'");
+
 		if (!$rss) {
 			$rss = new FeedParser($feed_data);
 			$rss->init();
-- 
cgit v1.2.3


From 5de40104872ee14b9015e69e8390174473166a73 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 02:21:11 +0400
Subject: disable marking for the time being

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 730adc664..b639c00ad 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -355,7 +355,7 @@
 
 		// set last update to now so if anything *simplepie* crashes later we won't be
 		// continuously failing on the same feed
-		db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'");
+		//db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'");
 
 		if (!$rss) {
 			$rss = new FeedParser($feed_data);
-- 
cgit v1.2.3


From 5d3e5a1bb2306baeeaeea7c324402ff409b4bd84 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 02:30:53 +0400
Subject: simplify feed cache age handling (reduce caching to sequential
 updates)

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index b639c00ad..f839c558b 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -104,9 +104,9 @@
 
 		// Test if feed is currently being updated by another process.
 		if (DB_TYPE == "pgsql") {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '10 minutes')";
+			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '1 minutes')";
 		} else {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
+			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 1 MINUTE))";
 		}
 
 		// Test if there is a limit to number of updated feeds
@@ -116,7 +116,8 @@
 		$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
-			WHERE
+				WHERE
+				ttrss_feeds.feed_url like '%tt-rss%feed%' AND
 				ttrss_feeds.owner_uid = ttrss_users.id
 				AND ttrss_users.id = ttrss_user_prefs.owner_uid
 				AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
@@ -245,14 +246,6 @@
 
 		$cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".xml";
 
-		// Ignore cache if new feed or manual update.
-		$cache_age = ($no_cache || is_null($last_updated) || strpos($last_updated, '1970-01-01') === 0) ? 30 : get_feed_update_interval($feed) * 60;
-
-		_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;
-
 		$rss = false;
 		$rss_hash = false;
 		$cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0;
@@ -262,7 +255,7 @@
 		if (file_exists($cache_filename) &&
 			is_readable($cache_filename) &&
 			!$auth_login && !$auth_pass &&
-			filemtime($cache_filename) > time() - $cache_age) {
+			filemtime($cache_filename) > time() - 30) {
 
 			_debug("using local cache.", $debug_enabled);
 
-- 
cgit v1.2.3


From 566417c4e73dbbd872b01ebdbc83abf2063dbcaf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 02:31:32 +0400
Subject: restore updstart threshold

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

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index f839c558b..a06f98885 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -104,9 +104,9 @@
 
 		// Test if feed is currently being updated by another process.
 		if (DB_TYPE == "pgsql") {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '1 minutes')";
+			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '10 minutes')";
 		} else {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 1 MINUTE))";
+			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
 		}
 
 		// Test if there is a limit to number of updated feeds
-- 
cgit v1.2.3


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

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

(limited to 'include')

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


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

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

(limited to 'include')

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


From f4ae0f053bc4c84bb5e28ca464bbedea9f3855db Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 10:26:32 +0400
Subject: update: remove debugging block

---
 include/rssfuncs.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index a06f98885..61f6ee6a0 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -116,8 +116,7 @@
 		$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
-				WHERE
-				ttrss_feeds.feed_url like '%tt-rss%feed%' AND
+			WHERE
 				ttrss_feeds.owner_uid = ttrss_users.id
 				AND ttrss_users.id = ttrss_user_prefs.owner_uid
 				AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
-- 
cgit v1.2.3


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

---
 include/colors.php    | 10 +++++-----
 include/functions.php |  9 +++++----
 include/rssfuncs.php  |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'include')

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


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

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