X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;ds=sidebyside;f=functions.php;h=6169f93a8cd4b827e3c4f3537e3460d842e0922d;hb=d9fa39f1d444fbd5a909aabe19dfc50aa8601131;hp=2dbe127b6d89d91e478ee3c4116b315fdd0ce783;hpb=9cd7c995e70be458e0843caacd492b59099f121d;p=tt-rss.git

diff --git a/functions.php b/functions.php
index 2dbe127b..6169f93a 100644
--- a/functions.php
+++ b/functions.php
@@ -12,15 +12,12 @@
 	require_once 'errors.php';
 	require_once 'version.php';
 
-	if (RSS_BACKEND_TYPE == "magpie") {	
-		require_once "magpierss/rss_fetch.inc";
-		require_once 'magpierss/rss_utils.inc';
-	} else if (RSS_BACKEND_TYPE == "simplepie") {
-		require_once 'simplepie/simplepie.inc';
-	}
-
+	define('MAGPIE_USER_AGENT_EXT', ' (Tiny Tiny RSS/' . VERSION . ')');
 	define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
 
+	require_once "magpierss/rss_fetch.inc";
+	require_once 'magpierss/rss_utils.inc';
+
 	function purge_feed($link, $feed_id, $purge_interval, $debug = false) {
 
 		$rows = -1;
@@ -178,7 +175,7 @@
 			$upd_intl = $line["update_interval"];
 
 			if (!$upd_intl || $upd_intl == 0) {
-				$upd_intl = get_pref($link, 'DEFAULT_UPDATE_INTERVAL', $user_id);
+				$upd_intl = get_pref($link, 'DEFAULT_UPDATE_INTERVAL', $user_id, false);
 			}
 
 			if ($upd_intl < 0) { 
@@ -205,69 +202,136 @@
 
 	}
 
-	function check_feed_favicon($feed_url, $feed, $link) {
-		$feed_url = str_replace("http://", "", $feed_url);
-		$feed_url = preg_replace("/\/.*$/", "", $feed_url);
-		
-		$icon_url = "http://$feed_url/favicon.ico";
-		$icon_file = ICONS_DIR . "/$feed.ico";
+	function fetch_file_contents($url) {
+		if (USE_CURL_FOR_ICONS) {
+			$tmpfile = tempnam(TMP_DIRECTORY, "ttrss-tmp");
 
-		if (!file_exists($icon_file)) {
+			$ch = curl_init($url);
+			$fp = fopen($tmpfile, "w");
 
-			if (USE_CURL_FOR_ICONS) {
-				error_reporting(0);
+			if ($fp) {
+				curl_setopt($ch, CURLOPT_FILE, $fp);
+				curl_exec($ch);
+				curl_close($ch);
+				fclose($fp);					
+			}
 
-				$ch = curl_init($icon_url);
-				$fp = fopen($icon_file, "w");
+			$contents =  file_get_contents($tmpfile);
+			unlink($tmpfile);
 
-				if ($fp) {
-					curl_setopt($ch, CURLOPT_FILE, $fp);
-					curl_setopt($ch, CURLOPT_FILE, $fp);
+			return $contents;
 
-					curl_exec($ch);
-					curl_close($ch);
-					fclose($fp);					
-				}
+		} else {
+			return file_get_contents($url);
+		}
+
+	}
+
+	// adapted from wordpress favicon plugin by Jeff Minard (http://thecodepro.com/)
+	// http://dev.wp-plugins.org/file/favatars/trunk/favatars.php
 
-				error_reporting (DEFAULT_ERROR_LEVEL);
+	function get_favicon_url($url) {
+
+		if ($html = @fetch_file_contents($url)) {
+
+			if ( preg_match('/<link[^>]+rel="(?:shortcut )?icon"[^>]+?href="([^"]+?)"/si', $html, $matches)) {
+				// Attempt to grab a favicon link from their webpage url
+				$linkUrl = html_entity_decode($matches[1]);
+
+				if (substr($linkUrl, 0, 1) == '/') {
+					$urlParts = parse_url($url);
+					$faviconURL = $urlParts['scheme'].'://'.$urlParts['host'].$linkUrl;
+				} else if (substr($linkUrl, 0, 7) == 'http://') {
+					$faviconURL = $linkUrl;
+				} else if (substr($url, -1, 1) == '/') {
+					$faviconURL = $url.$linkUrl;
+				} else {
+					$faviconURL = $url.'/'.$linkUrl;
+				}
 
 			} else {
+				// If unsuccessful, attempt to "guess" the favicon location
+				$urlParts = parse_url($url);
+				$faviconURL = $urlParts['scheme'].'://'.$urlParts['host'].'/favicon.ico';
+			}
+		}
 
-				error_reporting(0);
-				$r = fopen($icon_url, "r");
-				error_reporting (DEFAULT_ERROR_LEVEL);
-	
-				if ($r) {
-					$tmpfname = tempnam(TMP_DIRECTORY, "ttrssicon");
+		// Run a test to see if what we have attempted to get actually exists.
+		if(USE_CURL_FOR_ICONS || url_validate($faviconURL)) {
+			return $faviconURL;
+		} else {
+			return false;
+		}
+	}
+
+	function url_validate($link) {
+                
+		$url_parts = @parse_url($link);
+
+		if ( empty( $url_parts["host"] ) )
+				return false;
+
+		if ( !empty( $url_parts["path"] ) ) {
+				$documentpath = $url_parts["path"];
+		} else {
+				$documentpath = "/";
+		}
+
+		if ( !empty( $url_parts["query"] ) )
+				$documentpath .= "?" . $url_parts["query"];
+
+		$host = $url_parts["host"];
+		$port = $url_parts["port"];
+		
+		if ( empty($port) )
+				$port = "80";
+
+		$socket = @fsockopen( $host, $port, $errno, $errstr, 30 );
+		
+		if ( !$socket )
+				return false;
 				
-					$t = fopen($tmpfname, "w");
-					
-					while (!feof($r)) {
-						$buf = fread($r, 16384);
-						fwrite($t, $buf);
-					}
-					
-					fclose($r);
-					fclose($t);
-	
-					error_reporting(0);
-					if (!rename($tmpfname, $icon_file)) {
-						unlink($tmpfname);
-					}
-	
-					chmod($icon_file, 0644);
-					
-					error_reporting (DEFAULT_ERROR_LEVEL);
-				}
+		fwrite ($socket, "HEAD ".$documentpath." HTTP/1.0\r\nHost: $host\r\n\r\n");
+
+		$http_response = fgets( $socket, 22 );
+
+		$responses = "/(200 OK)|(30[0-9] Moved)/";
+		if ( preg_match($responses, $http_response) ) {
+				fclose($socket);
+				return true;
+		} else {
+				return false;
+		}
+
+	} 
+
+	function check_feed_favicon($site_url, $feed, $link) {
+		$favicon_url = get_favicon_url($site_url);
+
+#		print "FAVICON [$site_url]: $favicon_url\n";
+
+		error_reporting(0);
+
+		$icon_file = ICONS_DIR . "/$feed.ico";
 
-			}	
+		if ($favicon_url && !file_exists($icon_file)) {
+			$contents = fetch_file_contents($favicon_url);
+
+			$fp = fopen($icon_file, "w");
+
+			if ($fp) {
+				fwrite($fp, $contents);
+				fclose($fp);
+				chmod($icon_file, 0644);
+			}
 		}
+
+		error_reporting(DEFAULT_ERROR_LEVEL);
+
 	}
 
 	function update_rss_feed($link, $feed_url, $feed, $ignore_daemon = false) {
 
-		if (WEB_DEMO_MODE) return;
-
 		if (DAEMON_REFRESH_ONLY && !$_GET["daemon"] && !$ignore_daemon) {
 			return;			
 		}
@@ -296,31 +360,13 @@
 
 		}
 
-		if (RSS_BACKEND_TYPE == "magpie") {		
-			error_reporting(0);
-			$rss = fetch_rss($fetch_url);
-			error_reporting (DEFAULT_ERROR_LEVEL);
-		} else if (RSS_BACKEND_TYPE == "simplepie") {
-			
-			if (!file_exists(SIMPLEPIE_CACHE_DIR)) {
-					mkdir(SIMPLEPIE_CACHE_DIR);
-			}
-
-			$rss = new SimplePie();
-			$rss->feed_url($fetch_url);
-			$rss->cache_location(SIMPLEPIE_CACHE_DIR);
-			$rss->init();
-		}
+		error_reporting(0);
+		$rss = fetch_rss($fetch_url);
+		error_reporting (DEFAULT_ERROR_LEVEL);
 		
 		$feed = db_escape_string($feed);
 
-		$rss_check = $rss;
-
-		if (RSS_BACKEND_TYPE == "simplepie") {
-			$rss_check = $rss->data;
-		}
-		
-		if ($rss_check) {
+		if ($rss) {
 			
 //			db_query($link, "BEGIN");
 
@@ -334,28 +380,20 @@
 			$owner_uid = db_fetch_result($result, 0, "owner_uid");
 
 			if (get_pref($link, 'ENABLE_FEED_ICONS', $owner_uid, false)) {	
-				check_feed_favicon($feed_url, $feed, $link);
+				check_feed_favicon($rss->channel["link"], $feed, $link);
 			}
 
 			if (!$registered_title || $registered_title == "[Unknown]") {
 			
-				if (RSS_BACKEND_TYPE == "magpie") {				
-					$feed_title = db_escape_string($rss->channel["title"]);
-				} else {
-					$feed_title = $rss->get_feed_title();
-				}
+				$feed_title = db_escape_string($rss->channel["title"]);
 				
 				db_query($link, "UPDATE ttrss_feeds SET 
 					title = '$feed_title' WHERE id = '$feed'");
 			}
 
-			if (RSS_BACKEND_TYPE == "magpie") {				
-				$site_url = $rss->channel["link"];
-				// weird, weird Magpie
-				if (!$site_url) $site_url = db_escape_string($rss->channel["link_"]);
-			} else {
-				$site_url = $rss->get_feed_link();
-			}
+			$site_url = $rss->channel["link"];
+			// weird, weird Magpie
+			if (!$site_url) $site_url = db_escape_string($rss->channel["link_"]);
 
 			if ($site_url && $orig_site_url != db_escape_string($site_url)) {
 				db_query($link, "UPDATE ttrss_feeds SET 
@@ -364,11 +402,7 @@
 
 //			print "I: " . $rss->channel["image"]["url"];
 
-			if (RSS_BACKEND_TYPE == "magpie") {
-				$icon_url = $rss->image["url"];
-			} else {
-				$icon_url = $rss->get_image_url(); # FIXME
-			}
+			$icon_url = $rss->image["url"];
 
 			if ($icon_url && !$orig_icon_url != db_escape_string($icon_url)) {
 				$icon_url = db_escape_string($icon_url);
@@ -380,7 +414,8 @@
 
 			$result = db_query($link, "SELECT reg_exp,
 				ttrss_filter_types.name AS name,
-				ttrss_filter_actions.name AS action
+				ttrss_filter_actions.name AS action,
+				action_param
 				FROM ttrss_filters,ttrss_filter_types,ttrss_filter_actions WHERE 					
 					enabled = true AND
 					owner_uid = $owner_uid AND
@@ -393,19 +428,15 @@
 
 				$filter["reg_exp"] = $line["reg_exp"];
 				$filter["action"] = $line["action"];
-				
+				$filter["action_param"] = $line["action_param"];
+			
 				array_push($filters[$line["name"]], $filter);
 			}
 
-			if (RSS_BACKEND_TYPE == "magpie") {			
-				$iterator = $rss->items;
-
-				if (!$iterator || !is_array($iterator)) $iterator = $rss->entries;
-				if (!$iterator || !is_array($iterator)) $iterator = $rss;
+			$iterator = $rss->items;
 
-			} else {
-				$iterator = $rss->get_items();
-			}
+			if (!$iterator || !is_array($iterator)) $iterator = $rss->entries;
+			if (!$iterator || !is_array($iterator)) $iterator = $rss;
 
 			if (!is_array($iterator)) {
 				/* db_query($link, "UPDATE ttrss_feeds 
@@ -416,148 +447,115 @@
 
 			foreach ($iterator as $item) {
 
-				if (RSS_BACKEND_TYPE == "magpie") {
-				
-					$entry_guid = $item["id"];
-		
-					if (!$entry_guid) $entry_guid = $item["guid"];
-					if (!$entry_guid) $entry_guid = $item["link"];
+				$entry_guid = $item["id"];
 	
-					if (!$entry_guid) continue;
-	
-					$entry_timestamp = "";
-	
-					$rss_2_date = $item['pubdate'];
-					$rss_1_date = $item['dc']['date'];
-					$atom_date = $item['issued'];
-					if (!$atom_date) $atom_date = $item['updated'];
+				if (!$entry_guid) $entry_guid = $item["guid"];
+				if (!$entry_guid) $entry_guid = $item["link"];
+				if (!$entry_guid) $entry_guid = make_guid_from_title($item["title"]);
+
+				if (!$entry_guid) continue;
+
+				$entry_timestamp = "";
+
+				$rss_2_date = $item['pubdate'];
+				$rss_1_date = $item['dc']['date'];
+				$atom_date = $item['issued'];
+				if (!$atom_date) $atom_date = $item['updated'];
+			
+				if ($atom_date != "") $entry_timestamp = parse_w3cdtf($atom_date);
+				if ($rss_1_date != "") $entry_timestamp = parse_w3cdtf($rss_1_date);
+				if ($rss_2_date != "") $entry_timestamp = strtotime($rss_2_date);
 				
-					if ($atom_date != "") $entry_timestamp = parse_w3cdtf($atom_date);
-					if ($rss_1_date != "") $entry_timestamp = parse_w3cdtf($rss_1_date);
-					if ($rss_2_date != "") $entry_timestamp = strtotime($rss_2_date);
-					
-					if ($entry_timestamp == "") {
-						$entry_timestamp = time();
-						$no_orig_date = 'true';
-					} else {
-						$no_orig_date = 'false';
-					}
-	
-					$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
-	
-					$entry_title = $item["title"];
-	
-					// strange Magpie workaround
-					$entry_link = $item["link_"];
-					if (!$entry_link) $entry_link = $item["link"];
-	
-					if (!$entry_title) continue;
-					if (!$entry_link) continue;
-	
-					$entry_content = $item["content:escaped"];
-	
-					if (!$entry_content) $entry_content = $item["content:encoded"];
-					if (!$entry_content) $entry_content = $item["content"];
-					if (!$entry_content) $entry_content = $item["atom_content"];
-					if (!$entry_content) $entry_content = $item["summary"];
-					if (!$entry_content) $entry_content = $item["description"];
-	
-	//				if (!$entry_content) continue;
-	
-					// WTF
-					if (is_array($entry_content)) {
-						$entry_content = $entry_content["encoded"];
-						if (!$entry_content) $entry_content = $entry_content["escaped"];
-					}
-	
-	//				print_r($item);
-	//				print_r(htmlspecialchars($entry_content));
-	//				print "<br>";
-	
-					$entry_content_unescaped = $entry_content;
-					$content_hash = "SHA1:" . sha1(strip_tags($entry_content));
-	
-					$entry_comments = $item["comments"];
-	
-					$entry_author = db_escape_string($item['dc']['creator']);
-	
-					$entry_guid = db_escape_string($entry_guid);
-	
-					$result = db_query($link, "SELECT id FROM	ttrss_entries 
-						WHERE guid = '$entry_guid'");
-	
-					$entry_content = db_escape_string($entry_content);
-					$entry_title = db_escape_string($entry_title);
-					$entry_link = db_escape_string($entry_link);
-					$entry_comments = db_escape_string($entry_comments);
-	
-					$num_comments = db_escape_string($item["slash"]["comments"]);
-	
-					if (!$num_comments) $num_comments = 0;
+				if ($entry_timestamp == "") {
+					$entry_timestamp = time();
+					$no_orig_date = 'true';
+				} else {
+					$no_orig_date = 'false';
+				}
+
+				$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
+
+				$entry_title = trim(strip_tags($item["title"]));
+
+				// strange Magpie workaround
+				$entry_link = $item["link_"];
+				if (!$entry_link) $entry_link = $item["link"];
+
+				if (!$entry_title) continue;
+#					if (!$entry_link) continue;
 
-				} else if (RSS_BACKEND_TYPE == "simplepie") {
+				$entry_link = strip_tags($entry_link);
+
+				$entry_content = $item["content:escaped"];
+
+				if (!$entry_content) $entry_content = $item["content:encoded"];
+				if (!$entry_content) $entry_content = $item["content"];
+				if (!$entry_content) $entry_content = $item["atom_content"];
+				if (!$entry_content) $entry_content = $item["summary"];
+				if (!$entry_content) $entry_content = $item["description"];
+
+//				if (!$entry_content) continue;
+
+				// WTF
+				if (is_array($entry_content)) {
+					$entry_content = $entry_content["encoded"];
+					if (!$entry_content) $entry_content = $entry_content["escaped"];
+				}
+
+//				print_r($item);
+//				print_r(htmlspecialchars($entry_content));
+//				print "<br>";
 
-					$entry_guid = $item->get_id();
+				$entry_content_unescaped = $entry_content;
+				$content_hash = "SHA1:" . sha1(strip_tags($entry_content));
 
-					if (!$entry_guid) {
-							$entry_guid = $item->get_permalink();
+				$entry_comments = strip_tags($item["comments"]);
+
+				$entry_author = db_escape_string(strip_tags($item['dc']['creator']));
+
+				if ($item['author']) {
+					if (!$entry_author) {
+						$entry_author = db_escape_string(strip_tags($item['author']['name']));
 					}
-	
-					if (!$entry_guid) continue;
-					
-					$entry_timestamp = $item->get_date("U");
-					
-					if ($entry_timestamp == "") {
-						$entry_timestamp = time();
-						$no_orig_date = 'true';
-					} else {
-						$no_orig_date = 'false';
+
+					if (!$entry_author) {
+						$entry_author = db_escape_string(strip_tags($item['author']['email']));
 					}
-	
-					$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
-	
-					$entry_title = $item->get_title();
-					$entry_link = $item->get_permalink();
-	
-					if (!$entry_title) continue;
-					if (!$entry_link) continue;
 
-					$entry_content = $item->get_description();
-						
-//					print_r(htmlspecialchars($entry_content));
-//					print "<br>";
-	
-					$entry_content_unescaped = $entry_content;
-					$content_hash = "SHA1:" . sha1(strip_tags($entry_content));
-	
-					$entry_comments = ""; # FIXME
-					
-					$entry_author = $item->get_author(0);
+					if (!$entry_author) {
+						$entry_author = db_escape_string(strip_tags($item['author']));
+					}
+				}
 
-					$entry_author = db_escape_string($entry_author->name);
-					
-					$entry_guid = db_escape_string($entry_guid);
+				if (preg_match('/^[\t\n\r ]*$/', $entry_author)) $entry_author = '';
 
-					$result = db_query($link, "SELECT id FROM	ttrss_entries 
-						WHERE guid = '$entry_guid'");
-	
-					$entry_content = db_escape_string($entry_content);
-					$entry_title = db_escape_string($entry_title);
-					$entry_link = db_escape_string($entry_link);
-					$entry_comments = db_escape_string($entry_comments);
-	
-					$num_comments = 0; # FIXME
-	
-					if (!$num_comments) $num_comments = 0;
+				$entry_guid = db_escape_string(strip_tags($entry_guid));
+
+				$result = db_query($link, "SELECT id FROM	ttrss_entries 
+					WHERE guid = '$entry_guid'");
 
+				$entry_content = db_escape_string($entry_content);
+				$entry_title = db_escape_string($entry_title);
+				$entry_link = db_escape_string($entry_link);
+				$entry_comments = db_escape_string($entry_comments);
+
+				$num_comments = db_escape_string($item["slash"]["comments"]);
+
+				if (!$num_comments) $num_comments = 0;
+
+				$dc_subject = $item['dc']['subject'];
+
+				$subject_tags = false;
+
+				if (is_array($dc_subject)) {
+					$subject_tags = $dc_subject;
+				} else if ($dc_subject) {
+					$subject_tags = array($dc_subject);
 				}
 
 				# sanitize content
 				
 				$entry_content = sanitize_rss($entry_content);
-				$entry_title = sanitize_rss($entry_title);
-				$entry_link = sanitize_rss($entry_link);
-				$entry_comments = sanitize_rss($entry_comments);
 
 				db_query($link, "BEGIN");
 
@@ -635,9 +633,12 @@
 
 //					error_reporting(0);
 
-					$filter_name = get_filter_name($entry_title, $entry_content, 
+					$tuple = get_filter_name($entry_title, $entry_content, 
 						$entry_link, $filters);
 
+					$filter_name = $tuple[0];
+					$filter_param = $tuple[1];
+
 					if ($filter_name == "filter") {
 						continue;
 					}
@@ -732,6 +733,27 @@
 
 				$entry_tags = $entry_tags[1];
 
+				# check for manual tags
+
+				if ($filter_name == "tag") {
+
+					$manual_tags = trim_array(split(",", $filter_param));
+
+					foreach ($manual_tags as $tag) {					
+						if (tag_is_valid($tag)) {
+							array_push($entry_tags, $tag);
+						}
+					}
+				}
+
+				if ($subject_tags) {
+					foreach ($subject_tags as $tag) {
+						if (tag_is_valid($tag)) {
+							array_push($entry_tags, $tag);
+						}
+					}
+				}
+
 				if (count($entry_tags) > 0) {
 				
 					db_query($link, "BEGIN");
@@ -820,7 +842,7 @@
 			foreach ($filters["title"] as $filter) {
 				$reg_exp = $filter["reg_exp"];			
 				if (preg_match("/$reg_exp/i", $title)) {
-					return $filter["action"];
+					return array($filter["action"], $filter["action_param"]);
 				}
 			}
 		}
@@ -829,7 +851,7 @@
 			foreach ($filters["content"] as $filter) {
 				$reg_exp = $filter["reg_exp"];			
 				if (preg_match("/$reg_exp/i", $content)) {
-					return $filter["action"];
+					return array($filter["action"], $filter["action_param"]);
 				}		
 			}
 		}
@@ -839,7 +861,7 @@
 				$reg_exp = $filter["reg_exp"];		
 				if (preg_match("/$reg_exp/i", $title) || 
 					preg_match("/$reg_exp/i", $content)) {
-					return $filter["action"];
+						return array($filter["action"], $filter["action_param"]);
 				}
 			}
 		}
@@ -849,7 +871,7 @@
 			foreach ($filters["link"] as $filter) {
 				$reg_exp = $filter["reg_exp"];
 				if (preg_match("/$reg_exp/i", $link)) {
-					return $filter["action"];
+					return array($filter["action"], $filter["action_param"]);
 				}
 			}
 		}
@@ -857,6 +879,51 @@
 		return false;
 	}
 
+	function get_filter_matches($title, $content, $link, $filters) {
+
+		$matches = array();
+
+		if ($filters["title"]) {
+			foreach ($filters["title"] as $filter) {
+				$reg_exp = $filter["reg_exp"];			
+				if (preg_match("/$reg_exp/i", $title)) {
+					array_push($matches, array($filter["action"], $filter["action_param"]));
+				}
+			}
+		}
+
+		if ($filters["content"]) {
+			foreach ($filters["content"] as $filter) {
+				$reg_exp = $filter["reg_exp"];			
+				if (preg_match("/$reg_exp/i", $content)) {
+					array_push($matches, array($filter["action"], $filter["action_param"]));
+				}		
+			}
+		}
+
+		if ($filters["both"]) {
+			foreach ($filters["both"] as $filter) {			
+				$reg_exp = $filter["reg_exp"];		
+				if (preg_match("/$reg_exp/i", $title) || 
+					preg_match("/$reg_exp/i", $content)) {
+						array_push($matches, array($filter["action"], $filter["action_param"]));
+				}
+			}
+		}
+
+		if ($filters["link"]) {
+			$reg_exp = $filter["reg_exp"];
+			foreach ($filters["link"] as $filter) {
+				$reg_exp = $filter["reg_exp"];
+				if (preg_match("/$reg_exp/i", $link)) {
+					array_push($matches, array($filter["action"], $filter["action_param"]));
+				}
+			}
+		}
+
+		return $matches;
+	}
+
 	function printFeedEntry($feed_id, $class, $feed_title, $unread, $icon_file, $link,
 		$rtl_content = false, $last_updated = false, $last_error = false) {
 
@@ -881,7 +948,8 @@
 			$link_title = "Updated: $last_updated";
 		}
 
-		$feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\" href=\"javascript:viewfeed('$feed_id', '', false);\">$feed_title</a>";
+		$feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\" 
+			href=\"javascript:viewfeed('$feed_id', '', false, '', false, 0);\">$feed_title</a>";
 
 		print "<li id=\"FEEDR-$feed_id\" class=\"$class\">";
 		if (get_pref($link, 'ENABLE_FEED_ICONS')) {
@@ -999,14 +1067,23 @@
 		return true;
 	}
 
-	function authenticate_user($link, $login, $password) {
+	function authenticate_user($link, $login, $password, $force_auth = false) {
 
 		if (!SINGLE_USER_MODE) {
 
 			$pwd_hash = 'SHA1:' . sha1($password);
-	
-			$result = db_query($link, "SELECT id,login,access_level FROM ttrss_users WHERE 
-				login = '$login' AND pwd_hash = '$pwd_hash'");
+
+			if ($force_auth && defined('_DEBUG_USER_SWITCH')) {
+				$query = "SELECT id,login,access_level
+	            FROM ttrss_users WHERE
+		         login = '$login'";
+			} else {
+				$query = "SELECT id,login,access_level
+	            FROM ttrss_users WHERE
+		         login = '$login' AND pwd_hash = '$pwd_hash'";
+			}
+
+			$result = db_query($link, $query);
 	
 			if (db_num_rows($result) == 1) {
 				$_SESSION["uid"] = db_fetch_result($result, 0, "id");
@@ -1133,6 +1210,14 @@
 	function login_sequence($link) {
 		if (!SINGLE_USER_MODE) {
 
+			if (defined('_DEBUG_USER_SWITCH') && $_SESSION["uid"]) {
+				$swu = db_escape_string($_REQUEST["swu"]);
+				if ($swu) {
+					$_SESSION["prefs_cache"] = false;
+					return authenticate_user($link, $swu, null, true);
+				}
+			}
+
 			if (!validate_session($link)) {
 				logout_user();
 				$redirect_uri = get_login_redirect();
@@ -1263,7 +1348,7 @@
 			return false;
 		} else {
 			return true;
-		} 
+		}
 	}
 
 	function file_is_locked($filename) {
@@ -1444,13 +1529,26 @@
 			}
 	}
 
-	function getAllCounters($link) {
-		getLabelCounters($link);
+	function getAllCounters($link, $omode = "tflc") {
+/*		getLabelCounters($link);
 		getFeedCounters($link);
 		getTagCounters($link);
 		getGlobalCounters($link);
 		if (get_pref($link, 'ENABLE_FEED_CATS')) {
 			getCategoryCounters($link);
+		} */
+
+		if (!$omode) $omode = "tflc";
+
+		getGlobalCounters($link);
+
+		if (strchr($omode, "l")) getLabelCounters($link);
+		if (strchr($omode, "f")) getFeedCounters($link);
+		if (strchr($omode, "t")) getTagCounters($link);
+		if (strchr($omode, "c")) {			
+			if (get_pref($link, 'ENABLE_FEED_CATS')) {
+				getCategoryCounters($link);
+			}
 		}
 	}	
 
@@ -1513,7 +1611,8 @@
 			$match_part = "marked = true";
 		} else if ($n_feed > 0) {
 
-			$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE parent_feed = '$n_feed'
+			$result = db_query($link, "SELECT id FROM ttrss_feeds 
+					WHERE parent_feed = '$n_feed'
 					AND hidden = false
 					AND owner_uid = " . $_SESSION["uid"]);
 
@@ -1523,12 +1622,15 @@
 				while ($line = db_fetch_assoc($result)) {
 					array_push($linked_feeds, "feed_id = " . $line["id"]);
 				}
+
+				array_push($linked_feeds, "feed_id = $n_feed");
 				
 				$match_part = implode(" OR ", $linked_feeds);
 
 				$result = db_query($link, "SELECT COUNT(int_id) AS unread 
 					FROM ttrss_user_entries
-					WHERE	unread = true AND ($match_part) AND owner_uid = " . $_SESSION["uid"]);
+					WHERE	unread = true AND ($match_part) 
+					AND owner_uid = " . $_SESSION["uid"]);
 
 				$unread = 0;
 
@@ -1633,7 +1735,7 @@
 		$result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id) 
 			FROM ttrss_user_entries WHERE int_id = post_int_id 
 				AND unread = true)) AS count FROM ttrss_tags 
-			WHERE owner_uid = 2 GROUP BY tag_name ORDER BY tag_name");
+			WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name ORDER BY tag_name");
 			
 		$tags = array();
 
@@ -1847,7 +1949,11 @@
 	}
 
 	function subscribe_to_feed($link, $feed_link, $cat_id = 0) {
-	
+
+		$feed_link = trim(preg_replace("/^feed:/", "", $feed_link));
+
+		if ($feed_link == "") return;
+
 		if ($cat_id == "0" || !$cat_id) {
 			$cat_qpart = "NULL";
 		} else {
@@ -1915,7 +2021,7 @@
 		print "<select id=\"$id\" name=\"$id\" $attributes>";
 
 		if ($include_all_cats) {
-			print "<option value=\"0\">Uncategorized</option>";
+			print "<option value=\"0\">"._('Uncategorized')."</option>";
 		}
 
 		$result = db_query($link, "SELECT id,title FROM ttrss_feed_categories
@@ -1944,9 +2050,9 @@
 
 	function getFeedCatTitle($link, $id) {
 		if ($id == -1) {
-			return "Special";
+			return _("Special");
 		} else if ($id < -10) {
-			return "Labels";
+			return _("Labels");
 		} else if ($id > 0) {
 			$result = db_query($link, "SELECT ttrss_feed_categories.title 
 				FROM ttrss_feeds, ttrss_feed_categories WHERE ttrss_feeds.id = '$id' AND
@@ -1954,7 +2060,7 @@
 			if (db_num_rows($result) == 1) {
 				return db_fetch_result($result, 0, "title");
 			} else {
-				return "Uncategorized";
+				return _("Uncategorized");
 			}
 		} else {
 			return "getFeedCatTitle($id) failed";
@@ -1964,7 +2070,7 @@
 
 	function getFeedTitle($link, $id) {
 		if ($id == -1) {
-			return "Starred articles";
+			return _("Starred articles");
 		} else if ($id < -10) {
 			$label_id = -10 - $id;
 			$result = db_query($link, "SELECT description FROM ttrss_labels WHERE id = '$label_id'");
@@ -2015,6 +2121,9 @@
 		print "<param key=\"feeds_sort_by_unread\" value=\"" . 
 			sprintf("%d", get_pref($link, "FEEDS_SORT_BY_UNREAD")) . "\"/>";
 
+		print "<param key=\"confirm_feed_catchup\" value=\"" . 
+			sprintf("%d", get_pref($link, "CONFIRM_FEED_CATCHUP")) . "\"/>";
+
 		print "</init-params>";
 	}
 
@@ -2024,6 +2133,18 @@
 			print "<param key=\"daemon_is_running\" value=\"".
 				sprintf("%d", file_is_locked("update_daemon.lock")) . "\"/>";
 		}
+		if (CHECK_FOR_NEW_VERSION && $_SESSION["access_level"] >= 10) {
+			
+			if ($_SESSION["last_version_check"] + 600 < time()) {
+				$new_version_details = check_for_update($link);
+
+				print "<param key=\"new_version_available\" value=\"".
+					sprintf("%d", $new_version_details != ""). "\"/>";
+
+				$_SESSION["last_version_check"] = time();
+			}
+		}
+
 		print "</runtime-info>";
 	}
 
@@ -2063,7 +2184,8 @@
 		return $search_query_part;
 	}
 
-	function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false) {
+	function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0) {
+
 			if ($search) {
 			
 				$search_query_part = getSearchSql($search, $match_on);
@@ -2198,9 +2320,9 @@
 			$feed_title = "";
 
 			if ($search && $search_mode == "all_feeds") {
-				$feed_title = "Global search results ($search)";
+				$feed_title = _("Global search results")." ($search)";
 			} else if ($search && preg_match('/^-?[0-9][0-9]*$/', $feed) == false) {
-				$feed_title = "Tag search results ($search, $feed)";
+				$feed_title = _("Tag search results")." ($search, $feed)";
 			} else if (preg_match('/^-?[0-9][0-9]*$/', $feed) == false) {
 				$feed_title = $feed;
 			} else if (preg_match('/^-?[0-9][0-9]*$/', $feed) != false && $feed >= 0) {
@@ -2212,11 +2334,11 @@
 							WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
 						$feed_title = db_fetch_result($result, 0, "title");
 					} else {
-						$feed_title = "Uncategorized";
+						$feed_title = _("Uncategorized");
 					}
 
 					if ($search) {
-						$feed_title = "Category search results ($search, $feed_title)";
+						$feed_title = _("Category search results")." ($search, $feed_title)";
 					}
 
 				} else {
@@ -2229,12 +2351,12 @@
 					$last_error = db_fetch_result($result, 0, "last_error");
 
 					if ($search) {
-						$feed_title = "Feed search results ($search, $feed_title)";
+						$feed_title = _("Feed search results") . " ($search, $feed_title)";
 					}
 				}
 	
 			} else if ($feed == -1) {
-				$feed_title = "Starred articles";
+				$feed_title = _("Starred articles");
 			} else if ($feed < -10) {
 				$label_id = -$feed - 11;
 				$result = db_query($link, "SELECT description FROM ttrss_labels
@@ -2242,7 +2364,7 @@
 				$feed_title = db_fetch_result($result, 0, "description");
 
 				if ($search) {
-					$feed_title = "Label search results ($search, $feed_title)";
+					$feed_title = _("Label search results") . " ($search, $feed_title)";
 				}
 			} else {
 				$feed_title = "?";
@@ -2261,15 +2383,17 @@
 				}
 	
 				$content_query_part = "content as content_preview,";
-				
+
 				$query = "SELECT 
+						guid,
 						ttrss_entries.id,ttrss_entries.title,
 						SUBSTRING(updated,1,16) as updated,
 						unread,feed_id,marked,link,last_read,
 						SUBSTRING(last_read,1,19) as last_read_noms,
 						$vfeed_query_part
 						$content_query_part
-						SUBSTRING(updated,1,19) as updated_noms
+						SUBSTRING(updated,1,19) as updated_noms,
+						author
 					FROM
 						ttrss_entries,ttrss_user_entries,ttrss_feeds
 					WHERE
@@ -2280,7 +2404,7 @@
 					$search_query_part
 					$view_query_part
 					$query_strategy_part ORDER BY $order_by
-					$limit_query_part";
+					$limit_query_part OFFSET $offset";
 					
 				$result = db_query($link, $query);
 	
@@ -2292,6 +2416,7 @@
 				$feed_kind = "Tags";
 	
 				$result = db_query($link, "SELECT
+					guid,
 					ttrss_entries.id as id,title,
 					SUBSTRING(updated,1,16) as updated,
 					unread,feed_id,
@@ -2327,30 +2452,31 @@
 		$feed_site_url = $qfh_ret[2];
 		$last_error = $qfh_ret[3];
 
-		print "<rss version=\"2.0\">
-			<channel>
-			<title>$feed_title</title>
-			<link>$feed_site_url</link>
-			<generator>Tiny Tiny RSS v".VERSION."</generator>";
-
-		while ($line = db_fetch_assoc($result)) {
-			print "<item>";
-			print "<link>" . htmlspecialchars($line["link"]) . "</link>";
-
-			$rfc822_date = date('r', strtotime($line["updated"]));
-
-			print "<pubDate>$rfc822_date</pubDate>";
-
-			print "<title>" . 
-				htmlspecialchars($line["title"]) . "</title>";
-
-			print "<description>" . 
-				htmlspecialchars($line["content_preview"]) . "</description>";
-
-			print "</item>";
-		}
-
-		print "</channel></rss>";
+ 		print "<rss version=\"2.0\">
+ 			<channel>
+ 			<title>$feed_title</title>
+ 			<link>$feed_site_url</link>
+ 			<generator>Tiny Tiny RSS v".VERSION."</generator>";
+ 
+ 		while ($line = db_fetch_assoc($result)) {
+ 			print "<item>";
+ 			print "<id>" . htmlspecialchars($line["guid"]) . "</id>";
+ 			print "<link>" . htmlspecialchars($line["link"]) . "</link>";
+  
+ 			$rfc822_date = date('r', strtotime($line["updated"]));
+  
+ 			print "<pubDate>$rfc822_date</pubDate>";
+ 
+ 			print "<title>" . 
+ 				htmlspecialchars($line["title"]) . "</title>";
+  
+ 			print "<description>" . 
+ 				htmlspecialchars($line["content_preview"]) . "</description>";
+  
+ 			print "</item>";
+  		}
+  
+ 		print "</channel></rss>";
 
 	}
 
@@ -2367,21 +2493,28 @@
 	}
 
 	function sanitize_rss($str) {
-		$res = "";
+		$res = $str;
 
 		$res = preg_replace('/<script.*?>/i', 
-					"<p class=\"scriptWarn\">", $str);
+			"<p class=\"scriptWarn\">Disabled script: ", $res);
+
+		$res = preg_replace('/<\/script.*?>/i', "</p>", $res);
 
-		$res = preg_replace('/<\/script>/i', 
-			"</p>", $res);
+/*		$res = preg_replace('/<embed.*?>/i', "", $res);
+
+		$res = preg_replace('/<object.*?>.*?<\/object>/i', 
+			"<p class=\"objectWarn\">(Disabled html object 
+			- flash or other embedded content)</p>", $res);  */
 
 		return $res;
 	}
 
 	function send_headlines_digests($link, $limit = 100) {
 
+		if (!DIGEST_ENABLE) return false;
+
 		$user_limit = DIGEST_EMAIL_LIMIT;
-		$days = DIGEST_DAYS_BACK;
+		$days = 1;
 
 		print "Sending digests, batch of max $user_limit users, days = $days, headline limit = $limit\n\n";
 
@@ -2405,7 +2538,9 @@
 				if ($headlines_count > 0) {
 					$rc = mail($line["login"] . " <" . $line["email"] . ">",
 						"[tt-rss] New headlines for last 24 hours", $digest,
-						"From: " . MAIL_FROM);
+						"From: " . MAIL_FROM . "\n".
+						"Content-Type: text/plain; charset=\"utf-8\"\n".
+						"Content-Transfer-Encoding: 8bit\n");
 					print "RC=$rc\n";
 					db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW() 
 							WHERE id = " . $line["id"]);
@@ -2420,7 +2555,7 @@
 	}
 
 	function prepare_headlines_digest($link, $user_id, $days = 1, $limit = 100) {
-		$tmp =  "New headlines for last 24 hours, as of " . date("Y/m/d H:m") . "\n";	
+		$tmp =  _("New headlines for last 24 hours, as of ") . date("Y/m/d H:m") . "\n";	
 		$tmp .= "=======================================================\n\n";
 
 		if (DB_TYPE == "pgsql") {
@@ -2438,7 +2573,7 @@
 				ttrss_user_entries,ttrss_entries,ttrss_feeds 
 			WHERE 
 				ref_id = ttrss_entries.id AND feed_id = ttrss_feeds.id 
-				AND hidden = false
+				AND include_in_digest = true
 				AND $interval_query
 				AND ttrss_user_entries.owner_uid = $user_id
 				AND unread = true ORDER BY ttrss_feeds.title, date_entered DESC
@@ -2464,15 +2599,15 @@
 		}
 
 		$tmp .= "--- \n";
-		$tmp .= "You have been sent this email because you have enabled daily digests in Tiny Tiny RSS at " . 
+		$tmp .= _("You have been sent this email because you have enabled daily digests in Tiny Tiny RSS at ") . 
 			DIGEST_HOSTNAME . "\n".
-			"To unsubscribe, visit your configuration options or contact instance owner.\n";
+			_("To unsubscribe, visit your configuration options or contact instance owner.\n");
 			
 
 		return array($tmp, $headlines_count);
 	}
 
-	function check_for_update($link) {
+	function check_for_update($link, $brief_fmt = true) {
 		$releases_feed = "http://tt-rss.spb.ru/releases.rss";
 
 		if (!CHECK_FOR_NEW_VERSION || $_SESSION["access_level"] < 10) {
@@ -2494,19 +2629,544 @@
 				return;
 			}			
 
-			$last_item = $items[0];
+			$latest_item = $items[0];
+
+			$latest_version = trim(preg_replace("/(Milestone)|(completed)/", "", $latest_item["title"]));
 
-			$last_version = trim(preg_replace("/(Milestone)|(completed)/", "", $last_item["title"]));
-			$cur_version = preg_replace("/\.99/", "", VERSION);
+			$release_url = sanitize_rss($latest_item["link"]);
+			$content = sanitize_rss($latest_item["description"]);
 
-			$release_url = sanitize_rss($last_item["link"]);
-			$content = sanitize_rss($last_item["description"]);
+			if (version_compare(VERSION, $latest_version) == -1) {
+				if ($brief_fmt) {
+					return "<div class=\"notice\"><a href=\"javascript:showBlockElement('milestoneDetails')\">	
+						New version of Tiny-Tiny RSS ($latest_version) is available (click for details)</a>
+						<div id=\"milestoneDetails\">$content</div></div>";
+				} else {
+					return "New version of <a target='_new' 
+						href='http://tt-rss.spb.ru/'>Tiny-Tiny RSS</a> ($latest_version) is available:
+					  	 <div>$content</div>";	
+				}
 
-			if ($cur_version != $last_version) {
-				return "<div class=\"notice\"><a href=\"javascript:showBlockElement('milestoneDetails')\">	
-					New version of Tiny-Tiny RSS ($last_version) is available (click for details)</a>
-					<div id=\"milestoneDetails\">$content</div></div>";
 			}			
 		}
 	}
+
+	function markArticlesById($link, $ids, $cmode) {
+
+		$tmp_ids = array();
+
+		foreach ($ids as $id) {
+			array_push($tmp_ids, "ref_id = '$id'");
+		}
+
+		$ids_qpart = join(" OR ", $tmp_ids);
+
+		if ($cmode == 0) {
+			db_query($link, "UPDATE ttrss_user_entries SET 
+			marked = false,last_read = NOW()
+			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+		} else if ($cmode == 1) {
+			db_query($link, "UPDATE ttrss_user_entries SET 
+			marked = true
+			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+		} else {
+			db_query($link, "UPDATE ttrss_user_entries SET 
+			marked = NOT marked,last_read = NOW()
+			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+		}
+	}
+
+	function catchupArticlesById($link, $ids, $cmode) {
+
+		$tmp_ids = array();
+
+		foreach ($ids as $id) {
+			array_push($tmp_ids, "ref_id = '$id'");
+		}
+
+		$ids_qpart = join(" OR ", $tmp_ids);
+
+		if ($cmode == 0) {
+			db_query($link, "UPDATE ttrss_user_entries SET 
+			unread = false,last_read = NOW()
+			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+		} else if ($cmode == 1) {
+			db_query($link, "UPDATE ttrss_user_entries SET 
+			unread = true
+			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+		} else {
+			db_query($link, "UPDATE ttrss_user_entries SET 
+			unread = NOT unread,last_read = NOW()
+			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+		}
+	}
+
+	function escape_for_form($s) {
+		return htmlspecialchars(db_unescape_string($s));
+	}
+
+	function make_guid_from_title($title) {
+		return preg_replace("/[ \"\',.:;]/", "-", 
+			mb_strtolower(strip_tags($title)));
+	}
+
+	function print_headline_subtoolbar($link, $feed_site_url, $feed_title, 
+			$bottom = false, $rtl_content = false, $feed_id = 0,
+			$is_cat = false, $search = false, $match_on = false,
+			$search_mode = false, $offset = 0) {
+
+			$user_page_offset = $offset + 1;
+
+			if (!$bottom) {
+				$class = "headlinesSubToolbar";
+				$tid = "headlineActionsTop";
+			} else {
+				$class = "headlinesSubToolbar";
+				$tid = "headlineActionsBottom";
+			}
+
+			print "<table class=\"$class\" id=\"$tid\"
+				width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
+
+			if ($rtl_content) {
+				$rtl_cpart = "RTL";
+			} else {
+				$rtl_cpart = "";
+			}
+
+			$page_prev_link = "javascript:viewFeedGoPage(-1)";
+			$page_next_link = "javascript:viewFeedGoPage(1)";
+			$page_first_link = "javascript:viewFeedGoPage(0)";
+
+			$catchup_page_link = "javascript:catchupPage()";
+			$catchup_feed_link = "javascript:catchupCurrentFeed()";
+
+			if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+
+				$sel_all_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)";
+				$sel_unread_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)";
+				$sel_none_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)";
+
+				$tog_unread_link = "javascript:selectionToggleUnread()";
+				$tog_marked_link = "javascript:selectionToggleMarked()";
+
+			} else {
+
+				$sel_all_link = "javascript:cdmSelectArticles('all')";
+				$sel_unread_link = "javascript:cdmSelectArticles('unread')";
+				$sel_none_link = "javascript:cdmSelectArticles('none')";
+
+				$tog_unread_link = "javascript:selectionToggleUnread(true)";
+				$tog_marked_link = "javascript:selectionToggleMarked(true)";
+
+			}
+
+			if (!strstr($_SESSION["client.userAgent"], "MSIE")) {
+
+				print "<td class=\"headlineActions$rtl_cpart\">
+					<ul class=\"headlineDropdownMenu\">
+					<li class=\"top2\">
+					Select:
+						<a href=\"$sel_all_link\">All</a>,
+						<a href=\"$sel_unread_link\">Unread</a>,
+						<a href=\"$sel_none_link\">None</a></li>
+					<li class=\"vsep\">&nbsp;</li>
+					<li class=\"top\">Selection<ul>
+						<li onclick=\"$tog_unread_link\">Toggle unread</li>
+						<li onclick=\"$tog_marked_link\">Toggle starred</li></ul></li>
+					<li class=\"vsep\">&nbsp;</li>
+					<li class=\"top\"><a href=\"$catchup_page_link\">Mark as read</a><ul>
+						<li onclick=\"$catchup_page_link\">This page</li>
+						<li onclick=\"$catchup_feed_link\">Entire feed</li></ul></li>
+					<li class=\"vsep\">&nbsp;</li>
+					<!-- <li class=\"top2\">
+					Page:
+						<a href=\"$page_prev_link\">Previous</a>,
+						<a href=\"$page_next_link\">Next</a></li> -->
+	
+					<li class=\"top\"><a href=\"$page_next_link\">Next page</a><ul>
+						<li onclick=\"$page_prev_link\">Previous page</li>
+						<li onclick=\"$page_first_link\">First page</li></ul></li>
+					</ul>  
+	
+					</td>"; 
+
+			} else {
+			// old style subtoolbar:
+
+				print "<td class=\"headlineActions$rtl_cpart\">".
+					_('Select:')."
+								<a href=\"$sel_all_link\">All</a>,
+								<a href=\"$sel_unread_link\">Unread</a>,
+								<a href=\"$sel_none_link\">None</a>
+						&nbsp;&nbsp;".
+						_('Toggle:')." <a href=\"$tog_unread_link\">Unread</a>,
+							<a href=\"$tog_marked_link\">Starred</a>
+						&nbsp;&nbsp;".
+						_('Mark as read:')."
+							<a href=\"#\" onclick=\"$catchup_page_link\">Page</a>,
+							<a href=\"#\" onclick=\"$catchup_feed_link\">Feed</a>";
+				print "</td>";  
+
+			}
+
+			if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
+				print "<td class=\"headlineActions$rtl_cpart\">
+					<a href=\"javascript:labelFromSearch('$search', '$search_mode',
+							'$match_on', '$feed_id', '$is_cat');\">
+						"._('Convert to Label')."</a></td>";
+			}
+
+			print "<td class=\"headlineTitle$rtl_cpart\">";
+		
+			if ($feed_site_url) {
+				if (!$bottom) {
+					$target = "target=\"_blank\"";
+				}
+				print "<a $target href=\"$feed_site_url\">$feed_title</a>";
+			} else {
+				print $feed_title;
+			}
+
+			if ($search) {
+				$search_q = "&q=$search&m=$match_on&smode=$search_mode";
+			}
+
+			if ($user_page_offset > 1) {
+				print " [$user_page_offset] ";
+			}
+
+			if (!$bottom) {
+				print "
+					<a target=\"_new\" 
+						href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
+						<img class=\"noborder\" 
+							alt=\"Generated feed\" src=\"images/feed-icon-12x12.png\">
+					</a>";
+			}
+				
+			print "</td>";
+			print "</tr></table>";
+
+		}
+
+	function outputFeedList($link, $tags = false) {
+
+		print "<ul class=\"feedList\" id=\"feedList\">\n";
+
+		$owner_uid = $_SESSION["uid"];
+
+		/* virtual feeds */
+
+		if (get_pref($link, 'ENABLE_FEED_CATS')) {
+			print "<li class=\"feedCat\">"._('Special')."</li>";
+			print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">";
+		}
+
+		$num_starred = getFeedUnread($link, -1);
+
+		$class = "virt";
+
+		if ($num_starred > 0) $class .= "Unread";
+
+		printFeedEntry(-1, $class, _("Starred articles"), $num_starred, 
+			"images/mark_set.png", $link);
+
+		if (get_pref($link, 'ENABLE_FEED_CATS')) {
+			print "</ul>\n";
+		}
+
+		if (!$tags) {
+
+			if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) {
+	
+				$result = db_query($link, "SELECT id,sql_exp,description FROM
+					ttrss_labels WHERE owner_uid = '$owner_uid' ORDER by description");
+		
+				if (db_num_rows($result) > 0) {
+					if (get_pref($link, 'ENABLE_FEED_CATS')) {
+						print "<li class=\"feedCat\">"._('Labels')."</li>";
+						print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">";
+					} else {
+						print "<li><hr></li>";
+					}
+				}
+		
+				while ($line = db_fetch_assoc($result)) {
+	
+					error_reporting (0);
+
+					$label_id = -$line['id'] - 11;
+					$count = getFeedUnread($link, $label_id);
+
+					$class = "label";
+	
+					if ($count > 0) {
+						$class .= "Unread";
+					}
+					
+					error_reporting (DEFAULT_ERROR_LEVEL);
+	
+					printFeedEntry($label_id, 
+						$class, db_unescape_string($line["description"]), 
+						$count, "images/label.png", $link);
+		
+				}
+
+				if (db_num_rows($result) > 0) {
+					if (get_pref($link, 'ENABLE_FEED_CATS')) {
+						print "</ul>";
+					}
+				}
+
+			}
+
+			if (!get_pref($link, 'ENABLE_FEED_CATS')) {
+				print "<li><hr></li>";
+			}
+
+			if (get_pref($link, 'ENABLE_FEED_CATS')) {
+				if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
+					$order_by_qpart = "category,unread DESC,title";
+				} else {
+					$order_by_qpart = "category,title";
+				}
+			} else {
+				if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
+					$order_by_qpart = "unread DESC,title";
+				} else {		
+					$order_by_qpart = "title";
+				}
+			}
+
+			$result = db_query($link, "SELECT ttrss_feeds.*,
+				SUBSTRING(last_updated,1,19) AS last_updated_noms,
+				(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
+					WHERE feed_id = ttrss_feeds.id AND unread = true
+						AND ttrss_user_entries.ref_id = ttrss_entries.id
+						AND owner_uid = '$owner_uid') as unread,
+				cat_id,last_error,
+				ttrss_feed_categories.title AS category,
+				ttrss_feed_categories.collapsed	
+				FROM ttrss_feeds LEFT JOIN ttrss_feed_categories 
+					ON (ttrss_feed_categories.id = cat_id)				
+				WHERE 
+					ttrss_feeds.hidden = false AND
+					ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL
+				ORDER BY $order_by_qpart"); 
+
+			$actid = $_GET["actid"];
+	
+			/* real feeds */
+	
+			$lnum = 0;
+	
+			$total_unread = 0;
+
+			$category = "";
+
+			$short_date = get_pref($link, 'SHORT_DATE_FORMAT');
+	
+			while ($line = db_fetch_assoc($result)) {
+			
+				$feed = db_unescape_string($line["title"]);
+				$feed_id = $line["id"];	  
+	
+				$subop = $_GET["subop"];
+				
+				$unread = $line["unread"];
+
+				if (get_pref($link, 'HEADLINES_SMART_DATE')) {
+					$last_updated = smart_date_time(strtotime($line["last_updated_noms"]));
+				} else {
+					$last_updated = date($short_date, strtotime($line["last_updated_noms"]));
+				}
+
+				$rtl_content = sql_bool_to_bool($line["rtl_content"]);
+
+				if ($rtl_content) {
+					$rtl_tag = "dir=\"RTL\"";
+				} else {
+					$rtl_tag = "";
+				}
+
+				$tmp_result = db_query($link,
+					"SELECT id,COUNT(unread) AS unread
+					FROM ttrss_feeds LEFT JOIN ttrss_user_entries 
+						ON (ttrss_feeds.id = ttrss_user_entries.feed_id) 
+					WHERE parent_feed = '$feed_id' AND unread = true 
+					GROUP BY ttrss_feeds.id");
+			
+				if (db_num_rows($tmp_result) > 0) {				
+					while ($l = db_fetch_assoc($tmp_result)) {
+						$unread += $l["unread"];
+					}
+				}
+
+				$cat_id = $line["cat_id"];
+
+				$tmp_category = $line["category"];
+
+				if (!$tmp_category) {
+					$tmp_category = _("Uncategorized");
+				}
+				
+	//			$class = ($lnum % 2) ? "even" : "odd";
+
+				if ($line["last_error"]) {
+					$class = "error";
+				} else {
+					$class = "feed";
+				}
+	
+				if ($unread > 0) $class .= "Unread";
+	
+				if ($actid == $feed_id) {
+					$class .= "Selected";
+				}
+	
+				$total_unread += $unread;
+
+				if ($category != $tmp_category && get_pref($link, 'ENABLE_FEED_CATS')) {
+				
+					if ($category) {
+						print "</ul></li>";
+					}
+				
+					$category = $tmp_category;
+
+					$collapsed = $line["collapsed"];
+
+					// workaround for NULL category
+					if ($category == _("Uncategorized")) {
+						if ($_COOKIE["ttrss_vf_uclps"] == 1) {
+							$collapsed = "t";
+						}
+					}
+
+					if ($collapsed == "t" || $collapsed == "1") {
+						$holder_class = "invisible";
+						$ellipsis = "...";
+					} else {
+						$holder_class = "";
+						$ellipsis = "";
+					}
+
+					$cat_id = sprintf("%d", $cat_id);
+
+					$cat_unread = getCategoryUnread($link, $cat_id);
+
+					$catctr_class = ($cat_unread > 0) ? "catCtrHasUnread" : "catCtrNoUnread";
+
+					print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
+						<a id=\"FCATN-$cat_id\" href=\"#\"onclick=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>
+							<a href=\"#\" onclick=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">
+							<span id=\"FCATCTR-$cat_id\" title=\"Click to browse category\" 
+							class=\"$catctr_class\">($cat_unread)</span> $ellipsis
+							</a></li>";
+
+					// !!! NO SPACE before <ul...feedCatList - breaks firstChild DOM function
+					// -> keyboard navigation, etc.
+					print "<li id=\"feedCatHolder\" class=\"$holder_class\"><ul class=\"feedCatList\" id=\"FCATLIST-$cat_id\">";
+				}
+	
+				printFeedEntry($feed_id, $class, $feed, $unread, 
+					"icons/$feed_id.ico", $link, $rtl_content, 
+					$last_updated, $line["last_error"]);
+	
+				++$lnum;
+			}
+
+			if (db_num_rows($result) == 0) {
+				print "<li>"._('No feeds to display.')."</li>";
+			}
+
+		} else {
+
+			// tags
+
+/*			$result = db_query($link, "SELECT tag_name,count(ttrss_entries.id) AS count
+				FROM ttrss_tags,ttrss_entries,ttrss_user_entries WHERE
+				post_int_id = ttrss_user_entries.int_id AND 
+				unread = true AND ref_id = ttrss_entries.id
+				AND ttrss_tags.owner_uid = '$owner_uid' GROUP BY tag_name	
+			UNION
+				select tag_name,0 as count FROM ttrss_tags WHERE owner_uid = '$owner_uid'
+			ORDER BY tag_name"); */
+
+			if (get_pref($link, 'ENABLE_FEED_CATS')) {
+				print "<li class=\"feedCat\">"._('Tags')."</li>";
+				print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">";
+			}
+
+			$result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id) 
+				FROM ttrss_user_entries WHERE int_id = post_int_id 
+					AND unread = true)) AS count FROM ttrss_tags 
+				WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name ORDER BY tag_name");
+
+			$tags = array();
+	
+			while ($line = db_fetch_assoc($result)) {
+				$tags[$line["tag_name"]] += $line["count"];
+			}
+	
+			foreach (array_keys($tags) as $tag) {
+	
+				$unread = $tags[$tag];
+	
+				$class = "tag";
+	
+				if ($unread > 0) {
+					$class .= "Unread";
+				}
+	
+				printFeedEntry($tag, $class, $tag, $unread, "images/tag.png", $link);
+	
+			} 
+
+			if (db_num_rows($result) == 0) {
+				print "<li>No tags to display.</li>";
+			}
+
+			if (get_pref($link, 'ENABLE_FEED_CATS')) {
+				print "</ul>\n";
+			}
+
+		}
+
+		print "</ul>";
+
+	}
+
+	function get_article_tags($link, $id) {
+
+		$a_id = db_escape_string($id);
+
+		$tmp_result = db_query($link, "SELECT DISTINCT tag_name FROM
+			ttrss_tags WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
+				ref_id = '$a_id' AND owner_uid = '".$_SESSION["uid"]."') ORDER BY tag_name");
+
+		$tags = array();	
+	
+		while ($tmp_line = db_fetch_assoc($tmp_result)) {
+			array_push($tags, $tmp_line["tag_name"]);				
+		}
+
+		return $tags;
+	}
+
+	function trim_value(&$value) {
+		$value = trim($value);
+	}	
+
+	function trim_array($array) {
+		$tmp = $array;
+		array_walk($tmp, 'trim_value');
+		return $tmp;
+	}
+
+	function tag_is_valid($tag) {
+		return ($tag !='' && !preg_match("/^[0-9]*$/", $tag));
+	}
+
 ?>