Update functions.php

Added new entry for pt_PT as requested. Thanks!

1 files changed, 2 insertions, 754 deletions

diff --git a/include/functions.php b/include/functions.php
index f03b24327..99ab7b096 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -78,6 +78,7 @@
 					"pl_PL" => "Polski",
 					"ru_RU" => "Русский",
 					"pt_BR" => "Portuguese/Brazil",
+					"pt_PT" => "Portuguese/Portugal",
 					"zh_CN" => "Simplified Chinese",
 					"zh_TW" => "Traditional Chinese",
 					"sv_SE" => "Svenska",
@@ -1247,757 +1248,4 @@
 		return $data;
 	}
 
-	function getCategoryTitle($cat_id) {
-
-		if ($cat_id == -1) {
-			return __("Special");
-		} else if ($cat_id == -2) {
-			return __("Labels");
-		} else {
-
-			$result = db_query("SELECT title FROM ttrss_feed_categories WHERE
-				id = '$cat_id'");
-
-			if (db_num_rows($result) == 1) {
-				return db_fetch_result($result, 0, "title");
-			} else {
-				return __("Uncategorized");
-			}
-		}
-	}
-
-
-	function getCategoryCounters() {
-		$ret_arr = array();
-
-		/* Labels category */
-
-		$cv = array("id" => -2, "kind" => "cat",
-			"counter" => getCategoryUnread(-2));
-
-		array_push($ret_arr, $cv);
-
-		$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
-			WHERE ttrss_cat_counters_cache.feed_id = id AND
-			ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid AND
-			ttrss_feed_categories.owner_uid = " . $_SESSION["uid"]);
-
-		while ($line = db_fetch_assoc($result)) {
-			$line["cat_id"] = (int) $line["cat_id"];
-
-			if ($line["num_children"] > 0) {
-				$child_counter = getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
-			} else {
-				$child_counter = 0;
-			}
-
-			$cv = array("id" => $line["cat_id"], "kind" => "cat",
-				"counter" => $line["unread"] + $child_counter);
-
-			array_push($ret_arr, $cv);
-		}
-
-		/* 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));
-
-		array_push($ret_arr, $cv);
-
-		return $ret_arr;
-	}
-
-	// only accepts real cats (>= 0)
-	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'
-				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);
-		}
-
-		return $unread;
-	}
-
-	function getCategoryUnread($cat, $owner_uid = false) {
-
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-
-		if ($cat >= 0) {
-
-			if ($cat != 0) {
-				$cat_query = "cat_id = '$cat'";
-			} else {
-				$cat_query = "cat_id IS NULL";
-			}
-
-			$result = db_query("SELECT id FROM ttrss_feeds WHERE $cat_query
-					AND owner_uid = " . $owner_uid);
-
-			$cat_feeds = array();
-			while ($line = db_fetch_assoc($result)) {
-				array_push($cat_feeds, "feed_id = " . $line["id"]);
-			}
-
-			if (count($cat_feeds) == 0) return 0;
-
-			$match_part = implode(" OR ", $cat_feeds);
-
-			$result = db_query("SELECT COUNT(int_id) AS unread
-				FROM ttrss_user_entries
-				WHERE	unread = true AND ($match_part)
-				AND owner_uid = " . $owner_uid);
-
-			$unread = 0;
-
-			# this needs to be rewritten
-			while ($line = db_fetch_assoc($result)) {
-				$unread += $line["unread"];
-			}
-
-			return $unread;
-		} else if ($cat == -1) {
-			return getFeedUnread(-1) + getFeedUnread(-2) + getFeedUnread(-3) + getFeedUnread(0);
-		} else if ($cat == -2) {
-
-			$result = db_query("
-				SELECT COUNT(unread) AS unread FROM
-					ttrss_user_entries, ttrss_user_labels2
-				WHERE article_id = ref_id AND unread = true
-					AND ttrss_user_entries.owner_uid = '$owner_uid'");
-
-			$unread = db_fetch_result($result, 0, "unread");
-
-			return $unread;
-
-		}
-	}
-
-	function getFeedUnread($feed, $is_cat = false) {
-		return getFeedArticles($feed, $is_cat, true, $_SESSION["uid"]);
-	}
-
-	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
-			WHERE owner_uid = '$owner_uid' AND unread = true AND label_id = '$label_id' AND article_id = ref_id");
-
-		if (db_num_rows($result) != 0) {
-			return db_fetch_result($result, 0, "unread");
-		} else {
-			return 0;
-		}
-	}
-
-	function getFeedArticles($feed, $is_cat = false, $unread_only = false,
-		$owner_uid = false) {
-
-		$n_feed = (int) $feed;
-		$need_entries = false;
-
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-
-		if ($unread_only) {
-			$unread_qpart = "unread = true";
-		} else {
-			$unread_qpart = "true";
-		}
-
-		if ($is_cat) {
-			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);
-
-			$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'");
-			return db_fetch_result($result, 0, "count");
-
-		} else if ($n_feed == -1) {
-			$match_part = "marked = true";
-		} else if ($n_feed == -2) {
-			$match_part = "published = true";
-		} else if ($n_feed == -3) {
-			$match_part = "unread = true AND score >= 0";
-
-			$intl = get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
-
-			if (DB_TYPE == "pgsql") {
-				$match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
-			} else {
-				$match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
-			}
-
-			$need_entries = true;
-
-		} else if ($n_feed == -4) {
-			$match_part = "true";
-		} else if ($n_feed >= 0) {
-
-			if ($n_feed != 0) {
-				$match_part = "feed_id = '$n_feed'";
-			} else {
-				$match_part = "feed_id IS NULL";
-			}
-
-		} else if ($feed < LABEL_BASE_INDEX) {
-
-			$label_id = feed_to_label_id($feed);
-
-			return getLabelUnread($label_id, $owner_uid);
-
-		}
-
-		if ($match_part) {
-
-			if ($need_entries) {
-				$from_qpart = "ttrss_user_entries,ttrss_entries";
-				$from_where = "ttrss_entries.id = ttrss_user_entries.ref_id AND";
-			} else {
-				$from_qpart = "ttrss_user_entries";
-				$from_where = "";
-			}
-
-			$query = "SELECT count(int_id) AS unread
-				FROM $from_qpart WHERE
-				$unread_qpart AND $from_where ($match_part) AND ttrss_user_entries.owner_uid = $owner_uid";
-
-			//echo "[$feed/$query]\n";
-
-			$result = db_query($query);
-
-		} else {
-
-			$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);
-		}
-
-		$unread = db_fetch_result($result, 0, "unread");
-
-		return $unread;
-	}
-
-	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
-			WHERE owner_uid = '$user_id' AND feed_id > 0");
-
-		$c_id = db_fetch_result($result, 0, "c_id");
-
-		return $c_id;
-	}
-
-	function getGlobalCounters($global_unread = -1) {
-		$ret_arr = array();
-
-		if ($global_unread == -1) {
-			$global_unread = getGlobalUnread();
-		}
-
-		$cv = array("id" => "global-unread",
-			"counter" => (int) $global_unread);
-
-		array_push($ret_arr, $cv);
-
-		$result = db_query("SELECT COUNT(id) AS fn FROM
-			ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
-
-		$subscribed_feeds = db_fetch_result($result, 0, "fn");
-
-		$cv = array("id" => "subscribed-feeds",
-			"counter" => (int) $subscribed_feeds);
-
-		array_push($ret_arr, $cv);
-
-		return $ret_arr;
-	}
-
-	function getVirtCounters() {
-
-		$ret_arr = array();
-
-		for ($i = 0; $i >= -4; $i--) {
-
-			$count = getFeedUnread($i);
-
-			if ($i == 0 || $i == -1 || $i == -2)
-				$auxctr = getFeedArticles($i, false);
-			else
-				$auxctr = 0;
-
-			$cv = array("id" => $i,
-				"counter" => (int) $count,
-				"auxcounter" => $auxctr);
-
-//			if (get_pref('EXTENDED_FEEDLIST'))
-//				$cv["xmsg"] = getFeedArticles($i)." ".__("total");
-
-			array_push($ret_arr, $cv);
-		}
-
-		$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']));
-
-				if (method_exists($feed['sender'], 'get_total'))
-					$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
-
-				array_push($ret_arr, $cv);
-			}
-		}
-
-		return $ret_arr;
-	}
-
-	function getLabelCounters($descriptions = false) {
-
-		$ret_arr = array();
-
-		$owner_uid = $_SESSION["uid"];
-
-		$result = db_query("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
-			FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
-				(ttrss_labels2.id = label_id)
-				LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id
-				WHERE ttrss_labels2.owner_uid = $owner_uid GROUP BY ttrss_labels2.id,
-					ttrss_labels2.caption");
-
-		while ($line = db_fetch_assoc($result)) {
-
-			$id = label_to_feed_id($line["id"]);
-
-			$cv = array("id" => $id,
-				"counter" => (int) $line["unread"],
-				"auxcounter" => (int) $line["total"]);
-
-			if ($descriptions)
-				$cv["description"] = $line["caption"];
-
-			array_push($ret_arr, $cv);
-		}
-
-		return $ret_arr;
-	}
-
-	function getFeedCounters($active_feed = false) {
-
-		$ret_arr = array();
-
-		$query = "SELECT ttrss_feeds.id,
-				ttrss_feeds.title,
-				".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
-				last_error, value AS count
-			FROM ttrss_feeds, ttrss_counters_cache
-			WHERE ttrss_feeds.owner_uid = ".$_SESSION["uid"]."
-				AND ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid
-				AND ttrss_counters_cache.feed_id = id";
-
-		$result = db_query($query);
-
-		while ($line = db_fetch_assoc($result)) {
-
-			$id = $line["id"];
-			$count = $line["count"];
-			$last_error = htmlspecialchars($line["last_error"]);
-
-			$last_updated = make_local_datetime($line['last_updated'], false);
-
-			$has_img = feed_has_icon($id);
-
-			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
-				$last_updated = '';
-
-			$cv = array("id" => $id,
-				"updated" => $last_updated,
-				"counter" => (int) $count,
-				"has_img" => (int) $has_img);
-
-			if ($last_error)
-				$cv["error"] = $last_error;
-
-//			if (get_pref('EXTENDED_FEEDLIST'))
-//				$cv["xmsg"] = getFeedArticles($id)." ".__("total");
-
-			if ($active_feed && $id == $active_feed)
-				$cv["title"] = truncate_string($line["title"], 30);
-
-			array_push($ret_arr, $cv);
-
-		}
-
-		return $ret_arr;
-	}
-
-	function get_pgsql_version() {
-		$result = db_query("SELECT version() AS version");
-		$version = explode(" ", db_fetch_result($result, 0, "version"));
-		return $version[1];
-	}
-
-	/**
-	 * @return array (code => Status code, message => error message if available)
-	 *
-	 *                 0 - OK, Feed already exists
-	 *                 1 - OK, Feed added
-	 *                 2 - Invalid URL
-	 *                 3 - URL content is HTML, no feeds available
-	 *                 4 - URL content is HTML which contains multiple feeds.
-	 *                     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 = '') {
-
-		global $fetch_last_error;
-
-		require_once "include/rssfuncs.php";
-
-		$url = fix_url($url);
-
-		if (!$url || !validate_feed_url($url)) return array("code" => 2);
-
-		$contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
-
-		if (!$contents) {
-			return array("code" => 5, "message" => $fetch_last_error);
-		}
-
-		if (is_html($contents)) {
-			$feedUrls = get_feeds_from_html($url, $contents);
-
-			if (count($feedUrls) == 0) {
-				return array("code" => 3);
-			} else if (count($feedUrls) > 1) {
-				return array("code" => 4, "feeds" => $feedUrls);
-			}
-			//use feed url as new URL
-			$url = key($feedUrls);
-		}
-
-		/* libxml_use_internal_errors(true);
-		$doc = new DOMDocument();
-		$doc->loadXML($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 {
-			$cat_qpart = "'$cat_id'";
-		}
-
-		$result = db_query(
-			"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';
-		}
-
-		$auth_pass = db_escape_string($auth_pass);
-
-		if (db_num_rows($result) == 0) {
-			$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(
-				"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($feed_id, true);
-			}
-
-			return array("code" => 1);
-		} else {
-			return array("code" => 0);
-		}
-	}
-
-	function print_feed_select($id, $default_id = "",
-		$attributes = "", $include_all_feeds = true,
-	  	$root_id = false, $nest_level = 0) {
-
-		if (!$root_id) {
-			print "<select id=\"$id\" name=\"$id\" $attributes>";
-			if ($include_all_feeds) {
-				$is_selected = ("0" == $default_id) ? "selected=\"1\"" : "";
-				print "<option $is_selected value=\"0\">".__('All feeds')."</option>";
-			}
-		}
-
-		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,
-				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
-					c2.parent_cat = ttrss_feed_categories.id) AS num_children
-				FROM ttrss_feed_categories
-				WHERE owner_uid = ".$_SESSION["uid"]." AND $parent_qpart ORDER BY title");
-
-			while ($line = db_fetch_assoc($result)) {
-
-				for ($i = 0; $i < $nest_level; $i++)
-					$line["title"] = " - " . $line["title"];
-
-				$is_selected = ("CAT:".$line["id"] == $default_id) ? "selected=\"1\"" : "";
-
-				printf("<option $is_selected value='CAT:%d'>%s</option>",
-					$line["id"], htmlspecialchars($line["title"]));
-
-				if ($line["num_children"] > 0)
-					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
-					WHERE cat_id = '".$line["id"]."' AND owner_uid = ".$_SESSION["uid"] . " ORDER BY title");
-
-				while ($fline = db_fetch_assoc($feed_result)) {
-					$is_selected = ($fline["id"] == $default_id) ? "selected=\"1\"" : "";
-
-					$fline["title"] = " + " . $fline["title"];
-
-					for ($i = 0; $i < $nest_level; $i++)
-						$fline["title"] = " - " . $fline["title"];
-
-					printf("<option $is_selected value='%d'>%s</option>",
-						$fline["id"], htmlspecialchars($fline["title"]));
-				}
-			}
-
-			if (!$root_id) {
-				$default_is_cat = ($default_id == "CAT:0");
-				$is_selected = $default_is_cat ? "selected=\"1\"" : "";
-
-				printf("<option $is_selected value='CAT:0'>%s</option>",
-					__("Uncategorized"));
-
-				$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)) {
-					$is_selected = ($fline["id"] == $default_id && !$default_is_cat) ? "selected=\"1\"" : "";
-
-					$fline["title"] = " + " . $fline["title"];
-
-					for ($i = 0; $i < $nest_level; $i++)
-						$fline["title"] = " - " . $fline["title"];
-
-					printf("<option $is_selected value='%d'>%s</option>",
-						$fline["id"], htmlspecialchars($fline["title"]));
-				}
-			}
-
-		} else {
-			$result = db_query("SELECT id,title FROM ttrss_feeds
-				WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
-			while ($line = db_fetch_assoc($result)) {
-
-				$is_selected = ($line["id"] == $default_id) ? "selected=\"1\"" : "";
-
-				printf("<option $is_selected value='%d'>%s</option>",
-					$line["id"], htmlspecialchars($line["title"]));
-			}
-		}
-
-		if (!$root_id) {
-			print "</select>";
-		}
-	}
-
-	function print_feed_cat_select($id, $default_id,
-		$attributes, $include_all_cats = true, $root_id = false, $nest_level = 0) {
-
-			if (!$root_id) {
-					print "<select id=\"$id\" name=\"$id\" default=\"$default_id\" onchange=\"catSelectOnChange(this)\" $attributes>";
-			}
-
-			if ($root_id)
-				$parent_qpart = "parent_cat = '$root_id'";
-			else
-				$parent_qpart = "parent_cat IS NULL";
-
-			$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
-				WHERE owner_uid = ".$_SESSION["uid"]." AND $parent_qpart ORDER BY title");
-
-			while ($line = db_fetch_assoc($result)) {
-				if ($line["id"] == $default_id) {
-					$is_selected = "selected=\"1\"";
-				} else {
-					$is_selected = "";
-				}
-
-				for ($i = 0; $i < $nest_level; $i++)
-					$line["title"] = " - " . $line["title"];
-
-				if ($line["title"])
-					printf("<option $is_selected value='%d'>%s</option>",
-						$line["id"], htmlspecialchars($line["title"]));
-
-				if ($line["num_children"] > 0)
-					print_feed_cat_select($id, $default_id, $attributes,
-						$include_all_cats, $line["id"], $nest_level+1);
-			}
-
-			if (!$root_id) {
-				if ($include_all_cats) {
-					if (db_num_rows($result) > 0) {
-						print "<option disabled=\"1\">--------</option>";
-					}
-
-					if ($default_id == 0) {
-						$is_selected = "selected=\"1\"";
-					} else {
-						$is_selected = "";
-					}
-
-					print "<option $is_selected value=\"0\">".__('Uncategorized')."</option>";
-				}
-				print "</select>";
-			}
-		}
-
-	function checkbox_to_sql_bool($val) {
-		return ($val == "on") ? "true" : "false";
-	}
-
-	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
-				FROM ttrss_feeds, ttrss_feed_categories WHERE ttrss_feeds.id = '$id' AND
-					cat_id = ttrss_feed_categories.id");
-			if (db_num_rows($result) == 1) {
-				return db_fetch_result($result, 0, "title");
-			} else {
-				return __("Uncategorized");
-			}
-		} else {
-			return "getFeedCatTitle($id) failed";
-		}
-
-	}
-
-	function getFeedIcon($id) {
-		switch ($id) {
-		case 0:
-			return "images/archive.png";
-			break;
-		case -1:
-			return "images/star.png";
-			break;
-		case -2:
-			return "images/feed.png";
-			break;
-		case -3:
-			return "images/fresh.png";
-			break;
-		case -4:
-			return "images/folder.png";
-			break;
-		case -6:
-			return "images/time.png";
-			break;
-		default:
-			if ($id < LABEL_BASE_INDEX) {
-				return "images/label.png";
-			} else {
-				if (file_exists(ICONS_DIR . "/$id.ico"))
-					return ICONS_URL . "/$id.ico";
-			}
-			break;
-		}
-
-		return false;
-	}
-
-	function getFeedTitle($id, $cat = false) {
-		if ($cat) {
-			return getCategoryTitle($id);
-		} else if ($id == -1) {
-			return __("Starred articles");
-		} else if ($id == -2) {
-			return __("Published articles");
-		} else if ($id == -3) {
-			return __("Fresh articles");
-		} else if ($id == -4) {
-			return __("All articles");
-		} else if ($id === 0 || $id === "0") {
-			return __("Archived articles");
-		} else if ($id == -6) {
-			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'");
-			if (db_num_rows($result) == 1) {
-				return db_fetch_result($result, 0, "caption");
-			} else {
-				return "Unknown label ($label_id)";
-			}
-
-		} else if (is_numeric($id) && $id > 0) {
-			$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 {
-				return "Unknown feed ($id)";
-			}
-		} else {
-			return $id;
-		}
-	}
-
-	// TODO: less dumb splitting
-	require_once "functions2.php";
-
-?>
+	function getCategoryTitle($cat_id)