]> git.wh0rd.org - tt-rss.git/blobdiff - include/functions.php
implement import/export of labels using OPML
[tt-rss.git] / include / functions.php
index 7bd64cc5b5c5d4962adb906950be455282813d0a..80581433aa6ee2c1e40c6bc2d4e64941686c7107 100644 (file)
                }
        }
 
-       function update_rss_feed($link, $feed, $ignore_daemon = false, $no_cache = false) {
-
-               global $memcache;
+       function print_select($id, $default, $values, $attributes = "") {
+               print "<select name=\"$id\" id=\"$id\" $attributes>";
+               foreach ($values as $v) {
+                       if ($v == $default)
+                               $sel = "selected=\"1\"";
+                        else
+                               $sel = "";
 
-               /* Update all feeds with the same URL to utilize memcache */
+                       print "<option value=\"$v\" $sel>$v</option>";
+               }
+               print "</select>";
+       }
 
-               if ($memcache) {
-                       $result = db_query($link, "SELECT f1.id
-                               FROM ttrss_feeds AS f1, ttrss_feeds AS f2
-                               WHERE   f2.feed_url = f1.feed_url AND f2.id = '$feed'");
+       function print_select_hash($id, $default, $values, $attributes = "") {
+               print "<select name=\"$id\" id='$id' $attributes>";
+               foreach (array_keys($values) as $v) {
+                       if ($v == $default)
+                               $sel = 'selected="selected"';
+                        else
+                               $sel = "";
 
-                       while ($line = db_fetch_assoc($result)) {
-                               update_rss_feed_real($link, $line["id"], $ignore_daemon, $no_cache);
-                       }
-               } else {
-                       update_rss_feed_real($link, $feed, $ignore_daemon, $no_cache);
+                       print "<option $sel value=\"$v\">".$values[$v]."</option>";
                }
+
+               print "</select>";
        }
 
-       function update_rss_feed_real($link, $feed, $ignore_daemon = false, $no_cache = false,
-               $override_url = false) {
+       function get_article_filters($filters, $title, $content, $link, $timestamp, $author, $tags) {
+               $matches = array();
 
-               require_once "lib/simplepie/simplepie.inc";
-               require_once "lib/magpierss/rss_fetch.inc";
-               require_once 'lib/magpierss/rss_utils.inc';
+               if ($filters["title"]) {
+                       foreach ($filters["title"] as $filter) {
+                               $reg_exp = $filter["reg_exp"];
+                               $inverse = $filter["inverse"];
+                               if ((!$inverse && @preg_match("/$reg_exp/i", $title)) ||
+                                               ($inverse && !@preg_match("/$reg_exp/i", $title))) {
 
-               global $memcache;
+                                       array_push($matches, array($filter["action"], $filter["action_param"]));
+                               }
+                       }
+               }
 
-               $debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
+               if ($filters["content"]) {
+                       foreach ($filters["content"] as $filter) {
+                               $reg_exp = $filter["reg_exp"];
+                               $inverse = $filter["inverse"];
 
-               if (!$_REQUEST["daemon"] && !$ignore_daemon) {
-                       return false;
-               }
+                               if ((!$inverse && @preg_match("/$reg_exp/i", $content)) ||
+                                               ($inverse && !@preg_match("/$reg_exp/i", $content))) {
 
-               if ($debug_enabled) {
-                       _debug("update_rss_feed: start");
+                                       array_push($matches, array($filter["action"], $filter["action_param"]));
+                               }
+                       }
                }
 
-               if (!$ignore_daemon) {
+               if ($filters["both"]) {
+                       foreach ($filters["both"] as $filter) {
+                               $reg_exp = $filter["reg_exp"];
+                               $inverse = $filter["inverse"];
 
-                       if (DB_TYPE == "pgsql") {
-                                       $updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
+                               if ($inverse) {
+                                       if (!@preg_match("/$reg_exp/i", $title) && !preg_match("/$reg_exp/i", $content)) {
+                                               array_push($matches, array($filter["action"], $filter["action_param"]));
+                                       }
                                } else {
-                                       $updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
+                                       if (@preg_match("/$reg_exp/i", $title) || preg_match("/$reg_exp/i", $content)) {
+                                               array_push($matches, array($filter["action"], $filter["action_param"]));
+                                       }
                                }
-
-                       $result = db_query($link, "SELECT id,update_interval,auth_login,
-                               auth_pass,cache_images,update_method
-                               FROM ttrss_feeds WHERE id = '$feed' AND $updstart_thresh_qpart");
-
-               } else {
-
-                       $result = db_query($link, "SELECT id,update_interval,auth_login,
-                               feed_url,auth_pass,cache_images,update_method,last_updated,
-                               mark_unread_on_update, owner_uid, update_on_checksum_change,
-                               pubsub_state
-                               FROM ttrss_feeds WHERE id = '$feed'");
-
-               }
-
-               if (db_num_rows($result) == 0) {
-                       if ($debug_enabled) {
-                               _debug("update_rss_feed: feed $feed NOT FOUND/SKIPPED");
                        }
-                       return false;
                }
 
-               $update_method = db_fetch_result($result, 0, "update_method");
-               $last_updated = db_fetch_result($result, 0, "last_updated");
-               $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"));
-               $update_on_checksum_change = sql_bool_to_bool(db_fetch_result($result,
-                       0, "update_on_checksum_change"));
-               $pubsub_state = db_fetch_result($result, 0, "pubsub_state");
-
-               db_query($link, "UPDATE ttrss_feeds SET last_update_started = NOW()
-                       WHERE id = '$feed'");
-
-               $auth_login = db_fetch_result($result, 0, "auth_login");
-               $auth_pass = db_fetch_result($result, 0, "auth_pass");
-
-               if ($update_method == 0)
-                       $update_method = DEFAULT_UPDATE_METHOD + 1;
-
-               // 1 - Magpie
-               // 2 - SimplePie
-               // 3 - Twitter OAuth
+               if ($filters["link"]) {
+                       $reg_exp = $filter["reg_exp"];
+                       foreach ($filters["link"] as $filter) {
+                               $reg_exp = $filter["reg_exp"];
+                               $inverse = $filter["inverse"];
 
-               if ($update_method == 2)
-                       $use_simplepie = true;
-               else
-                       $use_simplepie = false;
+                               if ((!$inverse && @preg_match("/$reg_exp/i", $link)) ||
+                                               ($inverse && !@preg_match("/$reg_exp/i", $link))) {
 
-               if ($debug_enabled) {
-                       _debug("update method: $update_method (feed setting: $update_method) (use simplepie: $use_simplepie)\n");
+                                       array_push($matches, array($filter["action"], $filter["action_param"]));
+                               }
+                       }
                }
 
-               if ($update_method == 1) {
-                       $auth_login = urlencode($auth_login);
-                       $auth_pass = urlencode($auth_pass);
-               }
+               if ($filters["date"]) {
+                       $reg_exp = $filter["reg_exp"];
+                       foreach ($filters["date"] as $filter) {
+                               $date_modifier = $filter["filter_param"];
+                               $inverse = $filter["inverse"];
+                               $check_timestamp = strtotime($filter["reg_exp"]);
 
-               $update_interval = db_fetch_result($result, 0, "update_interval");
-               $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
-               $fetch_url = db_fetch_result($result, 0, "feed_url");
+                               # no-op when timestamp doesn't parse to prevent misfires
 
-               if ($update_interval < 0) { return false; }
+                               if ($check_timestamp) {
+                                       $match_ok = false;
 
-               $feed = db_escape_string($feed);
+                                       if ($date_modifier == "before" && $timestamp < $check_timestamp ||
+                                               $date_modifier == "after" && $timestamp > $check_timestamp) {
+                                                       $match_ok = true;
+                                       }
 
-               if ($auth_login && $auth_pass ){
-                       $url_parts = array();
-                       preg_match("/(^[^:]*):\/\/(.*)/", $fetch_url, $url_parts);
+                                       if ($inverse) $match_ok = !$match_ok;
 
-                       if ($url_parts[1] && $url_parts[2]) {
-                               $fetch_url = $url_parts[1] . "://$auth_login:$auth_pass@" . $url_parts[2];
+                                       if ($match_ok) {
+                                               array_push($matches, array($filter["action"], $filter["action_param"]));
+                                       }
+                               }
                        }
-
                }
 
-               if ($override_url)
-                       $fetch_url = $override_url;
+               if ($filters["author"]) {
+                       foreach ($filters["author"] as $filter) {
+                               $reg_exp = $filter["reg_exp"];
+                               $inverse = $filter["inverse"];
+                               if ((!$inverse && @preg_match("/$reg_exp/i", $author)) ||
+                                               ($inverse && !@preg_match("/$reg_exp/i", $author))) {
 
-               if ($debug_enabled) {
-                       _debug("update_rss_feed: fetching [$fetch_url]...");
+                                       array_push($matches, array($filter["action"], $filter["action_param"]));
+                               }
+                       }
                }
 
-               $obj_id = md5("FDATA:$use_simplepie:$fetch_url");
-
-               if ($memcache && $obj = $memcache->get($obj_id)) {
-
-                       if ($debug_enabled) {
-                               _debug("update_rss_feed: data found in memcache.");
-                       }
+               if ($filters["tag"]) {
 
-                       $rss = $obj;
+                       $tag_string = join(",", $tags);
 
-               } else {
+                       foreach ($filters["tag"] as $filter) {
+                               $reg_exp = $filter["reg_exp"];
+                               $inverse = $filter["inverse"];
 
-                       if ($update_method == 3) {
-                               $rss = fetch_twitter_rss($link, $fetch_url, $owner_uid);
-                       } else if ($update_method == 1) {
+                               if ((!$inverse && @preg_match("/$reg_exp/i", $tag_string)) ||
+                                               ($inverse && !@preg_match("/$reg_exp/i", $tag_string))) {
 
-                               define('MAGPIE_CACHE_AGE', get_feed_update_interval($link, $feed) * 60);
-                               define('MAGPIE_CACHE_ON', !$no_cache);
-                               define('MAGPIE_FETCH_TIME_OUT', 60);
-                               define('MAGPIE_CACHE_DIR', CACHE_DIR . "/magpie");
+                                       array_push($matches, array($filter["action"], $filter["action_param"]));
+                               }
+                       }
+               }
 
-                               $rss = @fetch_rss($fetch_url);
-                       } else {
-                               $simplepie_cache_dir = CACHE_DIR . "/simplepie";
 
-                               if (!is_dir($simplepie_cache_dir)) {
-                                       mkdir($simplepie_cache_dir);
-                               }
+               return $matches;
+       }
 
-                               $rss = new SimplePie();
-                               $rss->set_useragent(SELF_USER_AGENT);
-       #                       $rss->set_timeout(10);
-                               $rss->set_feed_url($fetch_url);
-                               $rss->set_output_encoding('UTF-8');
-                               $rss->force_feed(true);
+       function find_article_filter($filters, $filter_name) {
+               foreach ($filters as $f) {
+                       if ($f[0] == $filter_name) {
+                               return $f;
+                       };
+               }
+               return false;
+       }
 
-                               if (SIMPLEPIE_CACHE_IMAGES && $cache_images) {
+       function calculate_article_score($filters) {
+               $score = 0;
 
-                                       if ($debug_enabled) {
-                                               _debug("enabling image cache");
-                                       }
+               foreach ($filters as $f) {
+                       if ($f[0] == "score") {
+                               $score += $f[1];
+                       };
+               }
+               return $score;
+       }
 
-                                       $rss->set_image_handler("image.php", 'i');
-                               }
+       function assign_article_to_labels($link, $id, $filters, $owner_uid) {
+               foreach ($filters as $f) {
+                       if ($f[0] == "label") {
+                               label_add_article($link, $id, $f[1], $owner_uid);
+                       };
+               }
+       }
 
-                               if ($debug_enabled) {
-                                       _debug("feed update interval (sec): " .
-                                               get_feed_update_interval($link, $feed)*60);
-                               }
+       function getmicrotime() {
+               list($usec, $sec) = explode(" ",microtime());
+               return ((float)$usec + (float)$sec);
+       }
 
-                               $rss->enable_cache(!$no_cache);
+       function print_radio($id, $default, $true_is, $values, $attributes = "") {
+               foreach ($values as $v) {
 
-                               if (!$no_cache) {
-                                       $rss->set_cache_location($simplepie_cache_dir);
-                                       $rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
-                               }
+                       if ($v == $default)
+                               $sel = "checked";
+                        else
+                               $sel = "";
 
-                               $rss->init();
+                       if ($v == $true_is) {
+                               $sel .= " value=\"1\"";
+                       } else {
+                               $sel .= " value=\"0\"";
                        }
 
-                       if ($memcache && $rss) $memcache->add($obj_id, $rss, 0, 300);
-               }
-
-//             print_r($rss);
+                       print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
+                               type=\"radio\" $sel $attributes name=\"$id\">&nbsp;$v&nbsp;";
 
-               if ($debug_enabled) {
-                       _debug("update_rss_feed: fetch done, parsing...");
                }
+       }
 
-               $feed = db_escape_string($feed);
+       function initialize_user_prefs($link, $uid, $profile = false) {
+
+               $uid = db_escape_string($uid);
 
-               if ($update_method == 2) {
-                       $fetch_ok = !$rss->error();
+               if (!$profile) {
+                       $profile = "NULL";
+                       $profile_qpart = "AND profile IS NULL";
                } else {
-                       $fetch_ok = !!$rss;
+                       $profile_qpart = "AND profile = '$profile'";
                }
 
-               if ($fetch_ok) {
-
-                       if ($debug_enabled) {
-                               _debug("update_rss_feed: processing feed data...");
-                       }
-
-//                     db_query($link, "BEGIN");
-
-                       $result = db_query($link, "SELECT title,icon_url,site_url,owner_uid
-                               FROM ttrss_feeds WHERE id = '$feed'");
+               if (get_schema_version($link) < 63) $profile_qpart = "";
 
-                       $registered_title = db_fetch_result($result, 0, "title");
-                       $orig_icon_url = db_fetch_result($result, 0, "icon_url");
-                       $orig_site_url = db_fetch_result($result, 0, "site_url");
+               db_query($link, "BEGIN");
 
-                       $owner_uid = db_fetch_result($result, 0, "owner_uid");
+               $result = db_query($link, "SELECT pref_name,def_value FROM ttrss_prefs");
 
-                       if ($use_simplepie) {
-                               $site_url = $rss->get_link();
-                       } else {
-                               $site_url = $rss->channel["link"];
-                       }
+               $u_result = db_query($link, "SELECT pref_name
+                       FROM ttrss_user_prefs WHERE owner_uid = '$uid' $profile_qpart");
 
-                       $site_url = rewrite_relative_url($fetch_url, $site_url);
+               $active_prefs = array();
 
-                       if ($debug_enabled) {
-                               _debug("update_rss_feed: checking favicon...");
-                       }
+               while ($line = db_fetch_assoc($u_result)) {
+                       array_push($active_prefs, $line["pref_name"]);
+               }
 
-                       check_feed_favicon($site_url, $feed, $link);
+               while ($line = db_fetch_assoc($result)) {
+                       if (array_search($line["pref_name"], $active_prefs) === FALSE) {
+//                             print "adding " . $line["pref_name"] . "<br>";
 
-                       if (!$registered_title || $registered_title == "[Unknown]") {
+                               if (get_schema_version($link) < 63) {
+                                       db_query($link, "INSERT INTO ttrss_user_prefs
+                                               (owner_uid,pref_name,value) VALUES
+                                               ('$uid', '".$line["pref_name"]."','".$line["def_value"]."')");
 
-                               if ($use_simplepie) {
-                                       $feed_title = db_escape_string($rss->get_title());
                                } else {
-                                       $feed_title = db_escape_string($rss->channel["title"]);
-                               }
-
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: registering title: $feed_title");
+                                       db_query($link, "INSERT INTO ttrss_user_prefs
+                                               (owner_uid,pref_name,value, profile) VALUES
+                                               ('$uid', '".$line["pref_name"]."','".$line["def_value"]."', $profile)");
                                }
 
-                               db_query($link, "UPDATE ttrss_feeds SET
-                                       title = '$feed_title' WHERE id = '$feed'");
                        }
+               }
 
-                       // weird, weird Magpie
-                       if (!$use_simplepie) {
-                               if (!$site_url) $site_url = db_escape_string($rss->channel["link_"]);
-                       }
+               db_query($link, "COMMIT");
 
-                       if ($site_url && $orig_site_url != db_escape_string($site_url)) {
-                               db_query($link, "UPDATE ttrss_feeds SET
-                                       site_url = '$site_url' WHERE id = '$feed'");
-                       }
+       }
 
-//                     print "I: " . $rss->channel["image"]["url"];
+       function get_ssl_certificate_id() {
+               if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
+                       return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
+                               $_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
+                               $_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
+                               $_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
+               }
+               return "";
+       }
 
-                       if (!$use_simplepie) {
-                               $icon_url = db_escape_string($rss->image["url"]);
-                       } else {
-                               $icon_url = db_escape_string($rss->get_image_url());
-                       }
+       function get_login_by_ssl_certificate($link) {
 
-                       $icon_url = substr($icon_url, 0, 250);
+               $cert_serial = db_escape_string(get_ssl_certificate_id());
 
-                       if ($icon_url && $orig_icon_url != $icon_url) {
-                               db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
-                       }
+               if ($cert_serial) {
+                       $result = db_query($link, "SELECT login FROM ttrss_user_prefs, ttrss_users
+                               WHERE pref_name = 'SSL_CERT_SERIAL' AND value = '$cert_serial' AND
+                               owner_uid = ttrss_users.id");
 
-                       if ($debug_enabled) {
-                               _debug("update_rss_feed: loading filters...");
+                       if (db_num_rows($result) != 0) {
+                               return db_escape_string(db_fetch_result($result, 0, "login"));
                        }
+               }
 
-                       $filters = load_filters($link, $feed, $owner_uid);
+               return "";
+       }
 
-//                     if ($debug_enabled) {
-//                             print_r($filters);
-//                     }
+       function get_remote_user($link) {
 
-                       if ($use_simplepie) {
-                               $iterator = $rss->get_items();
-                       } else {
-                               $iterator = $rss->items;
-                               if (!$iterator || !is_array($iterator)) $iterator = $rss->entries;
-                               if (!$iterator || !is_array($iterator)) $iterator = $rss;
-                       }
+               if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH) {
+                       return db_escape_string($_SERVER["REMOTE_USER"]);
+               }
 
-                       if (!is_array($iterator)) {
-                               /* db_query($link, "UPDATE ttrss_feeds
-                                       SET last_error = 'Parse error: can\'t find any articles.'
-                                       WHERE id = '$feed'"); */
+               return db_escape_string(get_login_by_ssl_certificate($link));
+       }
 
-                               // clear any errors and mark feed as updated if fetched okay
-                               // even if it's blank
-
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: entry iterator is not an array, no articles?");
-                               }
+       function get_remote_fakepass($link) {
+               if (get_remote_user($link))
+                       return "******";
+               else
+                       return "";
+       }
 
-                               db_query($link, "UPDATE ttrss_feeds
-                                       SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
+       function authenticate_user($link, $login, $password, $force_auth = false) {
 
-                               return; // no articles
-                       }
+               if (!SINGLE_USER_MODE) {
 
-                       if ($pubsub_state != 2 && PUBSUBHUBBUB_ENABLED) {
+                       $pwd_hash1 = encrypt_password($password);
+                       $pwd_hash2 = encrypt_password($password, $login);
+                       $login = db_escape_string($login);
 
-                               if ($debug_enabled) _debug("update_rss_feed: checking for PUSH hub...");
+                       $remote_user = get_remote_user($link);
 
-                               $feed_hub_url = false;
-                               if ($use_simplepie) {
-                                       $links = $rss->get_links('hub');
+                       if ($remote_user && $remote_user == $login && $login != "admin") {
 
-                                       if ($links && is_array($links)) {
-                                               foreach ($links as $l) {
-                                                       $feed_hub_url = $l;
-                                                       break;
-                                               }
-                                       }
+                               $login = $remote_user;
 
-                               } else {
-                                       $atom = $rss->channel['atom'];
+                               $query = "SELECT id,login,access_level,pwd_hash
+                   FROM ttrss_users WHERE
+                                       login = '$login'";
 
-                                       if ($atom) {
-                                               if ($atom['link@rel'] == 'hub') {
-                                                       $feed_hub_url = $atom['link@href'];
-                                               }
+                               if (defined('AUTO_CREATE_USER') && AUTO_CREATE_USER
+                                               && $_SERVER["REMOTE_USER"]) {
+                                       $result = db_query($link, $query);
 
-                                               if (!$feed_hub_url && $atom['link#'] > 1) {
-                                                       for ($i = 2; $i <= $atom['link#']; $i++) {
-                                                               if ($atom["link#$i@rel"] == 'hub') {
-                                                                       $feed_hub_url = $atom["link#$i@href"];
-                                                                       break;
-                                                               }
-                                                       }
-                                               }
-                                       } else {
-                                               $feed_hub_url = $rss->channel['link_hub'];
+                                       // First login ?
+                                       if (db_num_rows($result) == 0) {
+                                               $query2 = "INSERT INTO ttrss_users
+                                                               (login,access_level,last_login,created)
+                                                               VALUES ('$login', 0, null, NOW())";
+                                               db_query($link, $query2);
                                        }
                                }
 
-                               if ($debug_enabled) _debug("update_rss_feed: feed hub url: $feed_hub_url");
-
-                               if ($feed_hub_url && function_exists('curl_init') &&
-                                       !ini_get("open_basedir")) {
-
-                                       require_once 'lib/pubsubhubbub/subscriber.php';
-
-                                       $callback_url = get_self_url_prefix() .
-                                               "/public.php?op=pubsub&id=$feed";
-
-                                       $s = new Subscriber($feed_hub_url, $callback_url);
-
-                                       $rc = $s->subscribe($fetch_url);
-
-                                       if ($debug_enabled)
-                                               _debug("update_rss_feed: feed hub url found, subscribe request sent.");
-
-                                       db_query($link, "UPDATE ttrss_feeds SET pubsub_state = 1
-                                               WHERE id = '$feed'");
-                               }
-                       }
-
-                       if ($debug_enabled) {
-                               _debug("update_rss_feed: processing articles...");
+                       } else {
+                               $query = "SELECT id,login,access_level,pwd_hash
+                   FROM ttrss_users WHERE
+                                       login = '$login' AND (pwd_hash = '$pwd_hash1' OR
+                                               pwd_hash = '$pwd_hash2')";
                        }
 
-                       foreach ($iterator as $item) {
-
-                               if ($_REQUEST['xdebug'] == 2) {
-                                       print_r($item);
-                               }
-
-                               if ($use_simplepie) {
-                                       $entry_guid = $item->get_id();
-                                       if (!$entry_guid) $entry_guid = $item->get_link();
-                                       if (!$entry_guid) $entry_guid = make_guid_from_title($item->get_title());
+                       $result = db_query($link, $query);
 
-                               } else {
+                       if (db_num_rows($result) == 1) {
+                               $_SESSION["uid"] = db_fetch_result($result, 0, "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));
 
-                                       $entry_guid = $item["id"];
+                               db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
+                                       $_SESSION["uid"]);
 
-                                       if (!$entry_guid) $entry_guid = $item["guid"];
-                                       if (!$entry_guid) $entry_guid = $item["about"];
-                                       if (!$entry_guid) $entry_guid = $item["link"];
-                                       if (!$entry_guid) $entry_guid = make_guid_from_title($item["title"]);
-                               }
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: guid $entry_guid");
+                               // LemonLDAP can send user informations via HTTP HEADER
+                               if (defined('AUTO_CREATE_USER') && AUTO_CREATE_USER){
+                                       // update user name
+                                       $fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN'];
+                                       if ($fullname){
+                                               $fullname = db_escape_string($fullname);
+                                               db_query($link, "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " .
+                                                       $_SESSION["uid"]);
+                                       }
+                                       // update user mail
+                                       $email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL'];
+                                       if ($email){
+                                               $email = db_escape_string($email);
+                                               db_query($link, "UPDATE ttrss_users SET email = '$email' WHERE id = " .
+                                                       $_SESSION["uid"]);
+                                       }
                                }
 
-                               if (!$entry_guid) continue;
+                               $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
+                               $_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
 
-                               $entry_timestamp = "";
+                               $_SESSION["last_version_check"] = time();
 
-                               if ($use_simplepie) {
-                                       $entry_timestamp = strtotime($item->get_date());
-                               } else {
-                                       $rss_2_date = $item['pubdate'];
-                                       $rss_1_date = $item['dc']['date'];
-                                       $atom_date = $item['issued'];
-                                       if (!$atom_date) $atom_date = $item['updated'];
+                               initialize_user_prefs($link, $_SESSION["uid"]);
 
-                                       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);
+                               return true;
+                       }
 
-                               }
+                       return false;
 
-                               if ($entry_timestamp == "" || $entry_timestamp == -1 || !$entry_timestamp) {
-                                       $entry_timestamp = time();
-                                       $no_orig_date = 'true';
-                               } else {
-                                       $no_orig_date = 'false';
-                               }
+               } else {
 
-                               $entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
+                       $_SESSION["uid"] = 1;
+                       $_SESSION["name"] = "admin";
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: date $entry_timestamp [$entry_timestamp_fmt]");
-                               }
+                       $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
 
-                               if ($use_simplepie) {
-                                       $entry_title = $item->get_title();
-                               } else {
-                                       $entry_title = trim(strip_tags($item["title"]));
-                               }
+                       initialize_user_prefs($link, $_SESSION["uid"]);
 
-                               if ($use_simplepie) {
-                                       $entry_link = $item->get_link();
-                               } else {
-                                       // strange Magpie workaround
-                                       $entry_link = $item["link_"];
-                                       if (!$entry_link) $entry_link = $item["link"];
-                               }
+                       return true;
+               }
+       }
 
-                               $entry_link = rewrite_relative_url($site_url, $entry_link);
+       function make_password($length = 8) {
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: title $entry_title");
-                                       _debug("update_rss_feed: link $entry_link");
-                               }
+               $password = "";
+               $possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ";
 
-                               if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
+       $i = 0;
 
-                               $entry_link = strip_tags($entry_link);
+               while ($i < $length) {
+                       $char = substr($possible, mt_rand(0, strlen($possible)-1), 1);
 
-                               if ($use_simplepie) {
-                                       $entry_content = $item->get_content();
-                                       if (!$entry_content) $entry_content = $item->get_description();
-                               } else {
-                                       $entry_content = $item["content:escaped"];
+                       if (!strstr($password, $char)) {
+                               $password .= $char;
+                               $i++;
+                       }
+               }
+               return $password;
+       }
 
-                                       if (!$entry_content) $entry_content = $item["content:encoded"];
-                                       if (!$entry_content) $entry_content = $item["content"]["encoded"];
-                                       if (!$entry_content) $entry_content = $item["content"];
+       // this is called after user is created to initialize default feeds, labels
+       // or whatever else
 
-                                       if (is_array($entry_content)) $entry_content = $entry_content[0];
+       // user preferences are checked on every login, not here
 
-                                       // Magpie bugs are getting ridiculous
-                                       if (trim($entry_content) == "Array") $entry_content = false;
+       function initialize_user($link, $uid) {
 
-                                       if (!$entry_content) $entry_content = $item["atom_content"];
-                                       if (!$entry_content) $entry_content = $item["summary"];
+               db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
+                       values ('$uid', 'Tiny Tiny RSS: New Releases',
+                       'http://tt-rss.org/releases.rss')");
 
-                                       if (!$entry_content ||
-                                               strlen($entry_content) < strlen($item["description"])) {
-                                                       $entry_content = $item["description"];
-                                       };
+               db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
+                       values ('$uid', 'Tiny Tiny RSS: Forum',
+                               'http://tt-rss.org/forum/rss.php')");
+       }
 
-                                       // WTF
-                                       if (is_array($entry_content)) {
-                                               $entry_content = $entry_content["encoded"];
-                                               if (!$entry_content) $entry_content = $entry_content["escaped"];
-                                       }
-                               }
+       function logout_user() {
+               session_destroy();
+               if (isset($_COOKIE[session_name()])) {
+                  setcookie(session_name(), '', time()-42000, '/');
+               }
+       }
 
-                               if ($_REQUEST["xdebug"] == 2) {
-                                       print "update_rss_feed: content: ";
-                                       print_r(htmlspecialchars($entry_content));
-                               }
+       function validate_csrf($csrf_token) {
+               return $csrf_token == $_SESSION['csrf_token'];
+       }
 
-                               $entry_content_unescaped = $entry_content;
+       function validate_session($link) {
+               if (SINGLE_USER_MODE) return true;
 
-                               if ($use_simplepie) {
-                                       $entry_comments = strip_tags($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();
+               $check_ip = $_SESSION['ip_address'];
 
-                                               $entry_author = db_escape_string($entry_author);
-                                       }
-                               } else {
-                                       $entry_comments = strip_tags($item["comments"]);
+               switch (SESSION_CHECK_ADDRESS) {
+               case 0:
+                       $check_ip = '';
+                       break;
+               case 1:
+                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
+                       break;
+               case 2:
+                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.'));
+                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
+                       break;
+               };
 
-                                       $entry_author = db_escape_string(strip_tags($item['dc']['creator']));
+               if ($check_ip && strpos($_SERVER['REMOTE_ADDR'], $check_ip) !== 0) {
+                       $_SESSION["login_error_msg"] =
+                               __("Session failed to validate (incorrect IP)");
+                       return false;
+               }
 
-                                       if ($item['author']) {
+               if ($_SESSION["ref_schema_version"] != get_schema_version($link, true))
+                       return false;
 
-                                               if (is_array($item['author'])) {
+               if ($_SESSION["uid"]) {
 
-                                                       if (!$entry_author) {
-                                                               $entry_author = db_escape_string(strip_tags($item['author']['name']));
-                                                       }
+                       $result = db_query($link,
+                               "SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");
 
-                                                       if (!$entry_author) {
-                                                               $entry_author = db_escape_string(strip_tags($item['author']['email']));
-                                                       }
-                                               }
+                       $pwd_hash = db_fetch_result($result, 0, "pwd_hash");
 
-                                               if (!$entry_author) {
-                                                       $entry_author = db_escape_string(strip_tags($item['author']));
-                                               }
-                                       }
-                               }
+                       if ($pwd_hash != $_SESSION["pwd_hash"]) {
+                               return false;
+                       }
+               }
 
-                               if (preg_match('/^[\t\n\r ]*$/', $entry_author)) $entry_author = '';
+/*             if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) {
 
-                               $entry_guid = db_escape_string(strip_tags($entry_guid));
-                               $entry_guid = mb_substr($entry_guid, 0, 250);
+                       //print_r($_SESSION);
 
-                               $result = db_query($link, "SELECT id FROM       ttrss_entries
-                                       WHERE guid = '$entry_guid'");
+                       if (time() > $_SESSION["cookie_lifetime"]) {
+                               return false;
+                       }
+               } */
 
-                               $entry_content = db_escape_string($entry_content, false);
+               return true;
+       }
 
-                               $content_hash = "SHA1:" . sha1(strip_tags($entry_content));
+       function login_sequence($link, $mobile = false) {
+               $_SESSION["prefs_cache"] = array();
 
-                               $entry_title = db_escape_string($entry_title);
-                               $entry_link = db_escape_string($entry_link);
-                               $entry_comments = mb_substr(db_escape_string($entry_comments), 0, 250);
-                               $entry_author = mb_substr($entry_author, 0, 250);
+               if (!SINGLE_USER_MODE) {
 
-                               if ($use_simplepie) {
-                                       $num_comments = 0; #FIXME#
-                               } else {
-                                       $num_comments = db_escape_string($item["slash"]["comments"]);
-                               }
+                       $login_action = $_POST["login_action"];
 
-                               if (!$num_comments) $num_comments = 0;
+                       # try to authenticate user if called from login form
+                       if ($login_action == "do_login") {
+                               $login = db_escape_string($_POST["login"]);
+                               $password = $_POST["password"];
+                               $remember_me = $_POST["remember_me"];
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: looking for tags [1]...");
-                               }
+                               if (authenticate_user($link, $login, $password)) {
+                                       $_POST["password"] = "";
 
-                               // parse <category> entries into tags
+                                       $_SESSION["language"] = $_POST["language"];
+                                       $_SESSION["ref_schema_version"] = get_schema_version($link, true);
+                                       $_SESSION["bw_limit"] = !!$_POST["bw_limit"];
 
-                               $additional_tags = array();
+                                       if ($_POST["profile"]) {
 
-                               if ($use_simplepie) {
+                                               $profile = db_escape_string($_POST["profile"]);
 
-                                       $additional_tags_src = $item->get_categories();
+                                               $result = db_query($link, "SELECT id FROM ttrss_settings_profiles
+                                                       WHERE id = '$profile' AND owner_uid = " . $_SESSION["uid"]);
 
-                                       if (is_array($additional_tags_src)) {
-                                               foreach ($additional_tags_src as $tobj) {
-                                                       array_push($additional_tags, $tobj->get_term());
+                                               if (db_num_rows($result) != 0) {
+                                                       $_SESSION["profile"] = $profile;
+                                                       $_SESSION["prefs_cache"] = array();
                                                }
                                        }
 
-                                       if ($debug_enabled) {
-                                               _debug("update_rss_feed: category tags:");
-                                               print_r($additional_tags);
-                                       }
-
-                               } else {
-
-                                       $t_ctr = $item['category#'];
-
-                                       if ($t_ctr == 0) {
-                                               $additional_tags = array();
-                                       } else if ($t_ctr > 0) {
-                                               $additional_tags = array($item['category']);
-
-                                               if ($item['category@term']) {
-                                                       array_push($additional_tags, $item['category@term']);
-                                               }
-
-                                               for ($i = 0; $i <= $t_ctr; $i++ ) {
-                                                       if ($item["category#$i"]) {
-                                                               array_push($additional_tags, $item["category#$i"]);
-                                                       }
-
-                                                       if ($item["category#$i@term"]) {
-                                                               array_push($additional_tags, $item["category#$i@term"]);
-                                                       }
-                                               }
+                                       if ($_REQUEST['return']) {
+                                               header("Location: " . $_REQUEST['return']);
+                                       } else {
+                                               header("Location: " . $_SERVER["REQUEST_URI"]);
                                        }
 
-                                       // parse <dc:subject> elements
+                                       exit;
 
-                                       $t_ctr = $item['dc']['subject#'];
+                                       return;
+                               } else {
+                                       $_SESSION["login_error_msg"] = __("Incorrect username or password");
+                               }
+                       }
 
-                                       if ($t_ctr > 0) {
-                                               array_push($additional_tags, $item['dc']['subject']);
+                       if (!$_SESSION["uid"] || !validate_session($link)) {
 
-                                               for ($i = 0; $i <= $t_ctr; $i++ ) {
-                                                       if ($item['dc']["subject#$i"]) {
-                                                               array_push($additional_tags, $item['dc']["subject#$i"]);
-                                                       }
-                                               }
-                                       }
+                               if (get_remote_user($link) && AUTO_LOGIN) {
+                                   authenticate_user($link, get_remote_user($link), null);
+                                   $_SESSION["ref_schema_version"] = get_schema_version($link, true);
+                               } else {
+                                   render_login_form($link, $mobile);
+                                   //header("Location: login.php");
+                                   exit;
                                }
+                       } else {
+                               /* bump login timestamp */
+                               db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
+                                       $_SESSION["uid"]);
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: looking for tags [2]...");
+                               if ($_SESSION["language"] && SESSION_COOKIE_LIFETIME > 0) {
+                                       setcookie("ttrss_lang", $_SESSION["language"],
+                                               time() + SESSION_COOKIE_LIFETIME);
                                }
 
-                               /* taaaags */
-                               // <a href="..." rel="tag">Xorg</a>, //
+                               // try to remove possible duplicates from feed counter cache
+//                             ccache_cleanup($link, $_SESSION["uid"]);
+                       }
 
-                               $entry_tags = null;
+               } else {
+                       return authenticate_user($link, "admin", null);
+               }
+       }
 
-                               preg_match_all("/<a.*?rel=['\"]tag['\"].*?\>([^<]+)<\/a>/i",
-                                       $entry_content_unescaped, $entry_tags);
-
-                               $entry_tags = $entry_tags[1];
-
-                               $entry_tags = array_merge($entry_tags, $additional_tags);
-                               $entry_tags = array_unique($entry_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);
-                               }
+       function truncate_string($str, $max_len, $suffix = '&hellip;') {
+               if (mb_strlen($str, "utf-8") > $max_len - 3) {
+                       return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
+               } else {
+                       return $str;
+               }
+       }
 
-                               # sanitize content
+       function theme_image($link, $filename) {
+               if ($link) {
+                       $theme_path = get_user_theme_path($link);
 
-                               $entry_content = sanitize_article_content($entry_content);
-                               $entry_title = sanitize_article_content($entry_title);
+                       if ($theme_path && is_file($theme_path.$filename)) {
+                               return $theme_path.$filename;
+                       } else {
+                               return $filename;
+                       }
+               } else {
+                       return $filename;
+               }
+       }
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: done collecting data [TITLE:$entry_title]");
-                               }
+       function get_user_theme($link) {
 
-                               db_query($link, "BEGIN");
+               if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
+                       $theme_name = get_pref($link, "_THEME_ID");
+                       if (is_dir("themes/$theme_name")) {
+                               return $theme_name;
+                       } else {
+                               return '';
+                       }
+               } else {
+                       return '';
+               }
 
-                               if (db_num_rows($result) == 0) {
+       }
 
-                                       if ($debug_enabled) {
-                                               _debug("update_rss_feed: base guid not found");
-                                       }
+       function get_user_theme_path($link) {
+               $theme_path = '';
 
-                                       // base post entry does not exist, create it
-
-                                       $result = db_query($link,
-                                               "INSERT INTO ttrss_entries
-                                                       (title,
-                                                       guid,
-                                                       link,
-                                                       updated,
-                                                       content,
-                                                       content_hash,
-                                                       no_orig_date,
-                                                       date_updated,
-                                                       date_entered,
-                                                       comments,
-                                                       num_comments,
-                                                       author)
-                                               VALUES
-                                                       ('$entry_title',
-                                                       '$entry_guid',
-                                                       '$entry_link',
-                                                       '$entry_timestamp_fmt',
-                                                       '$entry_content',
-                                                       '$content_hash',
-                                                       $no_orig_date,
-                                                       NOW(),
-                                                       NOW(),
-                                                       '$entry_comments',
-                                                       '$num_comments',
-                                                       '$entry_author')");
-                               } else {
-                                       // we keep encountering the entry in feeds, so we need to
-                                       // update date_updated column so that we don't get horrible
-                                       // dupes when the entry gets purged and reinserted again e.g.
-                                       // in the case of SLOW SLOW OMG SLOW updating feeds
+               if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
+                       $theme_name = get_pref($link, "_THEME_ID");
 
-                                       $base_entry_id = db_fetch_result($result, 0, "id");
+                       if ($theme_name && is_dir("themes/$theme_name")) {
+                               $theme_path = "themes/$theme_name/";
+                       } else {
+                               $theme_name = '';
+                       }
+               } else {
+                       $theme_path = '';
+               }
 
-                                       db_query($link, "UPDATE ttrss_entries SET date_updated = NOW()
-                                               WHERE id = '$base_entry_id'");
+               if ($theme_path) {
+                       if (is_file("$theme_path/theme.ini")) {
+                               $ini = parse_ini_file("$theme_path/theme.ini", true);
+                               if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED) {
+                                       return $theme_path;
                                }
+                       }
+               }
+               return '';
+       }
 
-                               // now it should exist, if not - bad luck then
+       function get_user_theme_options($link) {
+               $t = get_user_theme_path($link);
 
-                               $result = db_query($link, "SELECT
-                                               id,content_hash,no_orig_date,title,
-                                               ".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'");
+               if ($t) {
+                       if (is_file("$t/theme.ini")) {
+                               $ini = parse_ini_file("$t/theme.ini", true);
+                               if ($ini['theme']['version']) {
+                                       return $ini['theme']['options'];
+                               }
+                       }
+               }
+               return '';
+       }
 
-                               $entry_ref_id = 0;
-                               $entry_int_id = 0;
+       function print_theme_includes($link) {
 
-                               if (db_num_rows($result) == 1) {
+               $t = get_user_theme_path($link);
+               $time = time();
 
-                                       if ($debug_enabled) {
-                                               _debug("update_rss_feed: base guid found, checking for user record");
-                                       }
+               if ($t) {
+                       print "<link rel=\"stylesheet\" type=\"text/css\"
+                               href=\"$t/theme.css?$time \">";
+                       if (file_exists("$t/theme.js")) {
+                               print "<script type=\"text/javascript\" src=\"$t/theme.js?$time\">
+                                       </script>";
+                       }
+               }
+       }
 
-                                       // this will be used below in update handler
-                                       $orig_content_hash = db_fetch_result($result, 0, "content_hash");
-                                       $orig_title = db_fetch_result($result, 0, "title");
-                                       $orig_num_comments = db_fetch_result($result, 0, "num_comments");
-                                       $orig_date_updated = strtotime(db_fetch_result($result,
-                                               0, "date_updated"));
+       function get_all_themes() {
+               $themes = glob("themes/*");
 
-                                       $ref_id = db_fetch_result($result, 0, "id");
-                                       $entry_ref_id = $ref_id;
+               asort($themes);
 
-                                       // check for user post link to main table
+               $rv = array();
 
-                                       // do we allow duplicate posts with same GUID in different feeds?
-                                       if (get_pref($link, "ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
-                                               $dupcheck_qpart = "AND (feed_id = '$feed' OR feed_id IS NULL)";
-                                       } else {
-                                               $dupcheck_qpart = "";
-                                       }
+               foreach ($themes as $t) {
+                       if (is_file("$t/theme.ini")) {
+                               $ini = parse_ini_file("$t/theme.ini", true);
+                               if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED &&
+                                                       !$ini['theme']['disabled']) {
+                                       $entry = array();
+                                       $entry["path"] = $t;
+                                       $entry["base"] = basename($t);
+                                       $entry["name"] = $ini['theme']['name'];
+                                       $entry["version"] = $ini['theme']['version'];
+                                       $entry["author"] = $ini['theme']['author'];
+                                       $entry["options"] = $ini['theme']['options'];
+                                       array_push($rv, $entry);
+                               }
+                       }
+               }
 
-                                       /* Collect article tags here so we could filter by them: */
+               return $rv;
+       }
 
-                                       $article_filters = get_article_filters($filters, $entry_title,
-                                               $entry_content, $entry_link, $entry_timestamp, $entry_author,
-                                               $entry_tags);
+       function convert_timestamp($timestamp, $source_tz, $dest_tz) {
 
-                                       if ($debug_enabled) {
-                                               _debug("update_rss_feed: article filters: ");
-                                               if (count($article_filters) != 0) {
-                                                       print_r($article_filters);
-                                               }
-                                       }
+               try {
+                       $source_tz = new DateTimeZone($source_tz);
+               } catch (Exception $e) {
+                       $source_tz = new DateTimeZone('UTC');
+               }
 
-                                       if (find_article_filter($article_filters, "filter")) {
-                                               db_query($link, "COMMIT"); // close transaction in progress
-                                               continue;
-                                       }
+               try {
+                       $dest_tz = new DateTimeZone($dest_tz);
+               } catch (Exception $e) {
+                       $dest_tz = new DateTimeZone('UTC');
+               }
 
-                                       $score = calculate_article_score($article_filters);
+               $dt = new DateTime(date('Y-m-d H:i:s', $timestamp), $source_tz);
+               return $dt->format('U') + $dest_tz->getOffset($dt);
+       }
 
-                                       if ($debug_enabled) {
-                                               _debug("update_rss_feed: initial score: $score");
-                                       }
+       function make_local_datetime($link, $timestamp, $long, $owner_uid = false,
+                                       $no_smart_dt = false) {
 
-                                       $query = "SELECT ref_id, int_id FROM ttrss_user_entries WHERE
-                                                       ref_id = '$ref_id' AND owner_uid = '$owner_uid'
-                                                       $dupcheck_qpart";
+               if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+               if (!$timestamp) $timestamp = '1970-01-01 0:00';
 
-//                                     if ($_REQUEST["xdebug"]) print "$query\n";
+               global $utc_tz;
+               global $tz_offset;
 
-                                       $result = db_query($link, $query);
+               # We store date in UTC internally
+               $dt = new DateTime($timestamp, $utc_tz);
 
-                                       // okay it doesn't exist - create user entry
-                                       if (db_num_rows($result) == 0) {
+               if ($tz_offset == -1) {
 
-                                               if ($debug_enabled) {
-                                                       _debug("update_rss_feed: user record not found, creating...");
-                                               }
+                       $user_tz_string = get_pref($link, 'USER_TIMEZONE', $owner_uid);
 
-                                               if ($score >= -500 && !find_article_filter($article_filters, 'catchup')) {
-                                                       $unread = 'true';
-                                                       $last_read_qpart = 'NULL';
-                                               } else {
-                                                       $unread = 'false';
-                                                       $last_read_qpart = 'NOW()';
-                                               }
+                       try {
+                               $user_tz = new DateTimeZone($user_tz_string);
+                       } catch (Exception $e) {
+                               $user_tz = $utc_tz;
+                       }
 
-                                               if (find_article_filter($article_filters, 'mark') || $score > 1000) {
-                                                       $marked = 'true';
-                                               } else {
-                                                       $marked = 'false';
-                                               }
+                       $tz_offset = $user_tz->getOffset($dt);
+               }
 
-                                               if (find_article_filter($article_filters, 'publish')) {
-                                                       $published = 'true';
-                                               } else {
-                                                       $published = 'false';
-                                               }
+               $user_timestamp = $dt->format('U') + $tz_offset;
 
-                                               $result = db_query($link,
-                                                       "INSERT INTO ttrss_user_entries
-                                                               (ref_id, owner_uid, feed_id, unread, last_read, marked,
-                                                                       published, score, tag_cache, label_cache, uuid)
-                                                       VALUES ('$ref_id', '$owner_uid', '$feed', $unread,
-                                                               $last_read_qpart, $marked, $published, '$score', '', '', '')");
+               if (!$no_smart_dt) {
+                       return smart_date_time($link, $user_timestamp,
+                               $tz_offset, $owner_uid);
+               } else {
+                       if ($long)
+                               $format = get_pref($link, 'LONG_DATE_FORMAT', $owner_uid);
+                       else
+                               $format = get_pref($link, 'SHORT_DATE_FORMAT', $owner_uid);
 
-                                               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);
+                       return date($format, $user_timestamp);
+               }
+       }
 
-                                                       $p = new Publisher(PUBSUBHUBBUB_HUB);
+       function smart_date_time($link, $timestamp, $tz_offset = 0, $owner_uid = false) {
+               if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
-                                                       $pubsub_result = $p->publish_update($rss_link);
-                                               }
+               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);
+                       return date($format, $timestamp);
+               } else {
+                       $format = get_pref($link, 'LONG_DATE_FORMAT', $owner_uid);
+                       return date($format, $timestamp);
+               }
+       }
 
-                                               $result = db_query($link,
-                                                       "SELECT int_id FROM ttrss_user_entries WHERE
-                                                               ref_id = '$ref_id' AND owner_uid = '$owner_uid' AND
-                                                               feed_id = '$feed' LIMIT 1");
+       function sql_bool_to_bool($s) {
+               if ($s == "t" || $s == "1" || $s == "true") {
+                       return true;
+               } else {
+                       return false;
+               }
+       }
 
-                                               if (db_num_rows($result) == 1) {
-                                                       $entry_int_id = db_fetch_result($result, 0, "int_id");
-                                               }
-                                       } else {
-                                               if ($debug_enabled) {
-                                                       _debug("update_rss_feed: user record FOUND");
-                                               }
+       function bool_to_sql_bool($s) {
+               if ($s) {
+                       return "true";
+               } else {
+                       return "false";
+               }
+       }
 
-                                               $entry_ref_id = db_fetch_result($result, 0, "ref_id");
-                                               $entry_int_id = db_fetch_result($result, 0, "int_id");
-                                       }
+       // 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) {
+               global $schema_version;
 
-                                       if ($debug_enabled) {
-                                               _debug("update_rss_feed: RID: $entry_ref_id, IID: $entry_int_id");
-                                       }
+               if (!$schema_version) {
+                       $result = db_query($link, "SELECT schema_version FROM ttrss_version");
+                       $version = db_fetch_result($result, 0, "schema_version");
+                       $schema_version = $version;
+                       return $version;
+               } else {
+                       return $schema_version;
+               }
+       }
 
-                                       $post_needs_update = false;
-                                       $update_insignificant = false;
+       function sanity_check($link) {
+               require_once 'errors.php';
 
-                                       if ($orig_num_comments != $num_comments) {
-                                               $post_needs_update = true;
-                                               $update_insignificant = true;
-                                       }
+               $error_code = 0;
+               $schema_version = get_schema_version($link, true);
 
-                                       if ($content_hash != $orig_content_hash) {
-                                               $post_needs_update = true;
-                                               $update_insignificant = false;
-                                       }
+               if ($schema_version != SCHEMA_VERSION) {
+                       $error_code = 5;
+               }
 
-                                       if (db_escape_string($orig_title) != $entry_title) {
-                                               $post_needs_update = true;
-                                               $update_insignificant = false;
-                                       }
+               if (DB_TYPE == "mysql") {
+                       $result = db_query($link, "SELECT true", false);
+                       if (db_num_rows($result) != 1) {
+                               $error_code = 10;
+                       }
+               }
 
-                                       // if post needs update, update it and mark all user entries
-                                       // linking to this post as updated
-                                       if ($post_needs_update) {
+               if (db_escape_string("testTEST") != "testTEST") {
+                       $error_code = 12;
+               }
 
-                                               if (defined('DAEMON_EXTENDED_DEBUG')) {
-                                                       _debug("update_rss_feed: post $entry_guid needs update...");
-                                               }
+               return array("code" => $error_code, "message" => $ERRORS[$error_code]);
+       }
 
-//                                             print "<!-- post $orig_title needs update : $post_needs_update -->";
-
-                                               db_query($link, "UPDATE ttrss_entries
-                                                       SET title = '$entry_title', content = '$entry_content',
-                                                               content_hash = '$content_hash',
-                                                               updated = '$entry_timestamp_fmt',
-                                                               num_comments = '$num_comments'
-                                                       WHERE id = '$ref_id'");
-
-                                               if (!$update_insignificant) {
-                                                       if ($mark_unread_on_update) {
-                                                               db_query($link, "UPDATE ttrss_user_entries
-                                                                       SET last_read = null, unread = true WHERE ref_id = '$ref_id'");
-                                                       } else if ($update_on_checksum_change) {
-                                                               db_query($link, "UPDATE ttrss_user_entries
-                                                                       SET last_read = null WHERE ref_id = '$ref_id'
-                                                                               AND unread = false");
-                                                       }
-                                               }
-                                       }
+       function file_is_locked($filename) {
+               if (function_exists('flock')) {
+                       $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
+                       if ($fp) {
+                               if (flock($fp, LOCK_EX | LOCK_NB)) {
+                                       flock($fp, LOCK_UN);
+                                       fclose($fp);
+                                       return false;
                                }
+                               fclose($fp);
+                               return true;
+                       } else {
+                               return false;
+                       }
+               }
+               return true; // consider the file always locked and skip the test
+       }
 
-                               db_query($link, "COMMIT");
+       function make_lockfile($filename) {
+               $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: assigning labels...");
-                               }
+               if (flock($fp, LOCK_EX | LOCK_NB)) {
+                       if (function_exists('posix_getpid')) {
+                               fwrite($fp, posix_getpid() . "\n");
+                       }
+                       return $fp;
+               } else {
+                       return false;
+               }
+       }
 
-                               assign_article_to_labels($link, $entry_ref_id, $article_filters,
-                                       $owner_uid);
+       function make_stampfile($filename) {
+               $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: looking for enclosures...");
-                               }
+               if (flock($fp, LOCK_EX | LOCK_NB)) {
+                       fwrite($fp, time() . "\n");
+                       flock($fp, LOCK_UN);
+                       fclose($fp);
+                       return true;
+               } else {
+                       return false;
+               }
+       }
+
+       function sql_random_function() {
+               if (DB_TYPE == "mysql") {
+                       return "RAND()";
+               } else {
+                       return "RANDOM()";
+               }
+       }
+
+       function catchup_feed($link, $feed, $cat_view, $owner_uid = false) {
 
-                               // enclosures
+                       if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
-                               $enclosures = array();
+                       //if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
 
-                               if ($use_simplepie) {
-                                       $encs = $item->get_enclosures();
+                       if (is_numeric($feed)) {
+                               if ($cat_view) {
 
-                                       if (is_array($encs)) {
-                                               foreach ($encs as $e) {
-                                                       $e_item = array(
-                                                               $e->link, $e->type, $e->length);
+                                       if ($feed >= 0) {
 
-                                                       array_push($enclosures, $e_item);
+                                               if ($feed > 0) {
+                                                       $cat_qpart = "cat_id = '$feed'";
+                                               } else {
+                                                       $cat_qpart = "cat_id IS NULL";
                                                }
-                                       }
 
-                               } else {
-                                       // <enclosure>
+                                               $tmp_result = db_query($link, "SELECT id
+                                                       FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = $owner_uid");
 
-                                       $e_ctr = $item['enclosure#'];
+                                               while ($tmp_line = db_fetch_assoc($tmp_result)) {
+
+                                                       $tmp_feed = $tmp_line["id"];
 
-                                       if ($e_ctr > 0) {
-                                               $e_item = array($item['enclosure@url'],
-                                                       $item['enclosure@type'],
-                                                       $item['enclosure@length']);
+                                                       db_query($link, "UPDATE ttrss_user_entries
+                                                               SET unread = false,last_read = NOW()
+                                                               WHERE feed_id = '$tmp_feed' AND owner_uid = $owner_uid");
+                                               }
+                                       } else if ($feed == -2) {
 
-                                               array_push($enclosures, $e_item);
+                                               db_query($link, "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 owner_uid = $owner_uid");
+                                       }
 
-                                               for ($i = 0; $i <= $e_ctr; $i++ ) {
+                               } else if ($feed > 0) {
 
-                                                       if ($item["enclosure#$i@url"]) {
-                                                               $e_item = array($item["enclosure#$i@url"],
-                                                                       $item["enclosure#$i@type"],
-                                                                       $item["enclosure#$i@length"]);
-                                                               array_push($enclosures, $e_item);
-                                                       }
-                                               }
+                                       db_query($link, "UPDATE ttrss_user_entries
+                                                       SET unread = false,last_read = NOW()
+                                                       WHERE feed_id = '$feed' AND owner_uid = $owner_uid");
+
+                               } else if ($feed < 0 && $feed > -10) { // special, like starred
+
+                                       if ($feed == -1) {
+                                               db_query($link, "UPDATE ttrss_user_entries
+                                                       SET unread = false,last_read = NOW()
+                                                       WHERE marked = true AND owner_uid = $owner_uid");
+                                       }
+
+                                       if ($feed == -2) {
+                                               db_query($link, "UPDATE ttrss_user_entries
+                                                       SET unread = false,last_read = NOW()
+                                                       WHERE published = true AND owner_uid = $owner_uid");
                                        }
 
-                                       // <media:content>
-                                       // can there be many of those? yes -fox
+                                       if ($feed == -3) {
 
-                                       $m_ctr = $item['media']['content#'];
+                                               $intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
 
-                                       if ($m_ctr > 0) {
-                                               $e_item = array($item['media']['content@url'],
-                                                       $item['media']['content@medium'],
-                                                       $item['media']['content@length']);
+                                               if (DB_TYPE == "pgsql") {
+                                                       $match_part = "updated > NOW() - INTERVAL '$intl hour' ";
+                                               } else {
+                                                       $match_part = "updated > DATE_SUB(NOW(),
+                                                               INTERVAL $intl HOUR) ";
+                                               }
 
-                                               array_push($enclosures, $e_item);
+                                               $result = db_query($link, "SELECT id FROM ttrss_entries,
+                                                       ttrss_user_entries WHERE $match_part AND
+                                                       unread = true AND
+                                                       ttrss_user_entries.ref_id = ttrss_entries.id AND
+                                                       owner_uid = $owner_uid");
 
-                                               for ($i = 0; $i <= $m_ctr; $i++ ) {
+                                               $affected_ids = array();
 
-                                                       if ($item["media"]["content#$i@url"]) {
-                                                               $e_item = array($item["media"]["content#$i@url"],
-                                                                       $item["media"]["content#$i@medium"],
-                                                                       $item["media"]["content#$i@length"]);
-                                                               array_push($enclosures, $e_item);
-                                                       }
+                                               while ($line = db_fetch_assoc($result)) {
+                                                       array_push($affected_ids, $line["id"]);
                                                }
 
+                                               catchupArticlesById($link, $affected_ids, 0);
                                        }
-                               }
 
+                                       if ($feed == -4) {
+                                               db_query($link, "UPDATE ttrss_user_entries
+                                                       SET unread = false,last_read = NOW()
+                                                       WHERE owner_uid = $owner_uid");
+                                       }
+
+                               } else if ($feed < -10) { // label
+
+                                       $label_id = -$feed - 11;
+
+                                       db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2
+                                               SET unread = false, last_read = NOW()
+                                                       WHERE label_id = '$label_id' AND unread = true
+                                                       AND owner_uid = '$owner_uid' AND ref_id = article_id");
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: article enclosures:");
-                                       print_r($enclosures);
                                }
 
+                               ccache_update($link, $feed, $owner_uid, $cat_view);
+
+                       } else { // tag
                                db_query($link, "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]);
+                               $tag_name = db_escape_string($feed);
 
-                                       $result = db_query($link, "SELECT id FROM ttrss_enclosures
-                                               WHERE content_url = '$enc_url' AND post_id = '$entry_ref_id'");
+                               $result = db_query($link, "SELECT post_int_id FROM ttrss_tags
+                                       WHERE tag_name = '$tag_name' AND owner_uid = $owner_uid");
 
-                                       if (db_num_rows($result) == 0) {
-                                               db_query($link, "INSERT INTO ttrss_enclosures
-                                                       (content_url, content_type, title, duration, post_id) VALUES
-                                                       ('$enc_url', '$enc_type', '', '$enc_dur', '$entry_ref_id')");
-                                       }
+                               while ($line = db_fetch_assoc($result)) {
+                                       db_query($link, "UPDATE ttrss_user_entries SET
+                                               unread = false, last_read = NOW()
+                                               WHERE int_id = " . $line["post_int_id"]);
                                }
-
                                db_query($link, "COMMIT");
+                       }
+       }
 
-                               // check for manual tags (we have to do it here since they're loaded from filters)
+       function getAllCounters($link, $omode = "flc", $active_feed = false) {
 
-                               foreach ($article_filters as $f) {
-                                       if ($f[0] == "tag") {
+               if (!$omode) $omode = "flc";
 
-                                               $manual_tags = trim_array(explode(",", $f[1]));
+               $data = getGlobalCounters($link);
 
-                                               foreach ($manual_tags as $tag) {
-                                                       if (tag_is_valid($tag)) {
-                                                               array_push($entry_tags, $tag);
-                                                       }
-                                               }
-                                       }
-                               }
+               $data = array_merge($data, getVirtCounters($link));
 
-                               // Skip boring tags
+               if (strchr($omode, "l")) $data = array_merge($data, getLabelCounters($link));
+               if (strchr($omode, "f")) $data = array_merge($data, getFeedCounters($link, $active_feed));
+               if (strchr($omode, "t")) $data = array_merge($data, getTagCounters($link));
+               if (strchr($omode, "c")) $data = array_merge($data, getCategoryCounters($link));
 
-                               $boring_tags = trim_array(explode(",", mb_strtolower(get_pref($link,
-                                       'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
+               return $data;
+       }
 
-                               $filtered_tags = array();
-                               $tags_to_cache = array();
+       function getCategoryTitle($link, $cat_id) {
 
-                               if ($entry_tags && is_array($entry_tags)) {
-                                       foreach ($entry_tags as $tag) {
-                                               if (array_search($tag, $boring_tags) === false) {
-                                                       array_push($filtered_tags, $tag);
-                                               }
-                                       }
-                               }
+               if ($cat_id == -1) {
+                       return __("Special");
+               } else if ($cat_id == -2) {
+                       return __("Labels");
+               } else {
 
-                               $filtered_tags = array_unique($filtered_tags);
+                       $result = db_query($link, "SELECT title FROM ttrss_feed_categories WHERE
+                               id = '$cat_id'");
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: filtered article tags:");
-                                       print_r($filtered_tags);
-                               }
+                       if (db_num_rows($result) == 1) {
+                               return db_fetch_result($result, 0, "title");
+                       } else {
+                               return "Uncategorized";
+                       }
+               }
+       }
 
-                               // Save article tags in the database
 
-                               if (count($filtered_tags) > 0) {
+       function getCategoryCounters($link) {
+               $ret_arr = array();
 
-                                       db_query($link, "BEGIN");
+               /* Labels category */
 
-                                       foreach ($filtered_tags as $tag) {
+               $cv = array("id" => -2, "kind" => "cat",
+                       "counter" => getCategoryUnread($link, -2));
 
-                                               $tag = sanitize_tag($tag);
-                                               $tag = db_escape_string($tag);
+               array_push($ret_arr, $cv);
 
-                                               if (!tag_is_valid($tag)) continue;
+               $age_qpart = getMaxAgeSubquery();
 
-                                               $result = db_query($link, "SELECT id FROM ttrss_tags
-                                                       WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND
-                                                       owner_uid = '$owner_uid' LIMIT 1");
+               $result = db_query($link, "SELECT id AS cat_id, value AS unread
+                       FROM ttrss_feed_categories, ttrss_cat_counters_cache
+                       WHERE ttrss_cat_counters_cache.feed_id = id AND
+                       ttrss_feed_categories.owner_uid = " . $_SESSION["uid"]);
 
-                                                       if ($result && db_num_rows($result) == 0) {
+               while ($line = db_fetch_assoc($result)) {
+                       $line["cat_id"] = (int) $line["cat_id"];
 
-                                                               db_query($link, "INSERT INTO ttrss_tags
-                                                                       (owner_uid,tag_name,post_int_id)
-                                                                       VALUES ('$owner_uid','$tag', '$entry_int_id')");
-                                                       }
+                       $cv = array("id" => $line["cat_id"], "kind" => "cat",
+                               "counter" => $line["unread"]);
 
-                                               array_push($tags_to_cache, $tag);
-                                       }
+                       array_push($ret_arr, $cv);
+               }
 
-                                       /* update the cache */
+               /* Special case: NULL category doesn't actually exist in the DB */
 
-                                       $tags_to_cache = array_unique($tags_to_cache);
+               $cv = array("id" => 0, "kind" => "cat",
+                       "counter" => ccache_find($link, 0, $_SESSION["uid"], true));
 
-                                       $tags_str = db_escape_string(join(",", $tags_to_cache));
+               array_push($ret_arr, $cv);
 
-                                       db_query($link, "UPDATE ttrss_user_entries
-                                               SET tag_cache = '$tags_str' WHERE ref_id = '$entry_ref_id'
-                                               AND owner_uid = $owner_uid");
+               return $ret_arr;
+       }
 
-                                       db_query($link, "COMMIT");
-                               }
+       function getCategoryUnread($link, $cat, $owner_uid = false) {
 
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: article processed");
-                               }
-                       }
+               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-                       if (!$last_updated) {
-                               if ($debug_enabled) {
-                                       _debug("update_rss_feed: new feed, catching it up...");
-                               }
-                               catchup_feed($link, $feed, false, $owner_uid);
+               if ($cat >= 0) {
+
+                       if ($cat != 0) {
+                               $cat_query = "cat_id = '$cat'";
+                       } else {
+                               $cat_query = "cat_id IS NULL";
                        }
 
-                       if ($debug_enabled) {
-                               _debug("purging feed...");
+                       $age_qpart = getMaxAgeSubquery();
+
+                       $result = db_query($link, "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"]);
                        }
 
-                       purge_feed($link, $feed, 0, $debug_enabled);
+                       if (count($cat_feeds) == 0) return 0;
 
-                       db_query($link, "UPDATE ttrss_feeds
-                               SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
+                       $match_part = implode(" OR ", $cat_feeds);
 
-//                     db_query($link, "COMMIT");
+                       $result = db_query($link, "SELECT COUNT(int_id) AS unread
+                               FROM ttrss_user_entries,ttrss_entries
+                               WHERE   unread = true AND ($match_part) AND id = ref_id
+                               AND $age_qpart AND owner_uid = " . $owner_uid);
 
-               } else {
+                       $unread = 0;
 
-                       if ($use_simplepie) {
-                               $error_msg = mb_substr($rss->error(), 0, 250);
-                       } else {
-                               $error_msg = mb_substr(magpie_error(), 0, 250);
+                       # this needs to be rewritten
+                       while ($line = db_fetch_assoc($result)) {
+                               $unread += $line["unread"];
                        }
 
-                       if ($debug_enabled) {
-                               _debug("update_rss_feed: error fetching feed: $error_msg");
-                       }
+                       return $unread;
+               } else if ($cat == -1) {
+                       return getFeedUnread($link, -1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0);
+               } else if ($cat == -2) {
 
-                       $error_msg = db_escape_string($error_msg);
+                       $result = db_query($link, "
+                               SELECT COUNT(unread) AS unread FROM
+                                       ttrss_user_entries, ttrss_labels2, ttrss_user_labels2, ttrss_feeds
+                               WHERE label_id = ttrss_labels2.id AND article_id = ref_id AND
+                                       ttrss_labels2.owner_uid = '$owner_uid'
+                                       AND unread = true AND feed_id = ttrss_feeds.id
+                                       AND ttrss_user_entries.owner_uid = '$owner_uid'");
 
-                       db_query($link,
-                               "UPDATE ttrss_feeds SET last_error = '$error_msg',
-                                       last_updated = NOW() WHERE id = '$feed'");
-               }
+                       $unread = db_fetch_result($result, 0, "unread");
 
-               if ($use_simplepie) {
-                       unset($rss);
-               }
+                       return $unread;
 
-               if ($debug_enabled) {
-                       _debug("update_rss_feed: done");
                }
-
        }
 
-       function print_select($id, $default, $values, $attributes = "") {
-               print "<select name=\"$id\" id=\"$id\" $attributes>";
-               foreach ($values as $v) {
-                       if ($v == $default)
-                               $sel = "selected=\"1\"";
-                        else
-                               $sel = "";
-
-                       print "<option value=\"$v\" $sel>$v</option>";
+       function getMaxAgeSubquery($days = COUNTERS_MAX_AGE) {
+               if (DB_TYPE == "pgsql") {
+                       return "ttrss_entries.date_updated >
+                               NOW() - INTERVAL '$days days'";
+               } else {
+                       return "ttrss_entries.date_updated >
+                               DATE_SUB(NOW(), INTERVAL $days DAY)";
                }
-               print "</select>";
        }
 
-       function print_select_hash($id, $default, $values, $attributes = "") {
-               print "<select name=\"$id\" id='$id' $attributes>";
-               foreach (array_keys($values) as $v) {
-                       if ($v == $default)
-                               $sel = 'selected="selected"';
-                        else
-                               $sel = "";
-
-                       print "<option $sel value=\"$v\">".$values[$v]."</option>";
-               }
-
-               print "</select>";
+       function getFeedUnread($link, $feed, $is_cat = false) {
+               return getFeedArticles($link, $feed, $is_cat, true, $_SESSION["uid"]);
        }
 
-       function get_article_filters($filters, $title, $content, $link, $timestamp, $author, $tags) {
-               $matches = array();
+       function getLabelUnread($link, $label_id, $owner_uid = false) {
+               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-               if ($filters["title"]) {
-                       foreach ($filters["title"] as $filter) {
-                               $reg_exp = $filter["reg_exp"];
-                               $inverse = $filter["inverse"];
-                               if ((!$inverse && @preg_match("/$reg_exp/i", $title)) ||
-                                               ($inverse && !@preg_match("/$reg_exp/i", $title))) {
+               $result = db_query($link, "
+                       SELECT COUNT(unread) AS unread FROM
+                               ttrss_user_entries, ttrss_labels2, ttrss_user_labels2, ttrss_feeds
+                       WHERE label_id = ttrss_labels2.id AND article_id = ref_id AND
+                               ttrss_labels2.owner_uid = '$owner_uid' AND ttrss_labels2.id = '$label_id'
+                               AND unread = true AND feed_id = ttrss_feeds.id
+                               AND ttrss_user_entries.owner_uid = '$owner_uid'");
 
-                                       array_push($matches, array($filter["action"], $filter["action_param"]));
-                               }
-                       }
+               if (db_num_rows($result) != 0) {
+                       return db_fetch_result($result, 0, "unread");
+               } else {
+                       return 0;
                }
+       }
 
-               if ($filters["content"]) {
-                       foreach ($filters["content"] as $filter) {
-                               $reg_exp = $filter["reg_exp"];
-                               $inverse = $filter["inverse"];
+       function getFeedArticles($link, $feed, $is_cat = false, $unread_only = false,
+               $owner_uid = false) {
 
-                               if ((!$inverse && @preg_match("/$reg_exp/i", $content)) ||
-                                               ($inverse && !@preg_match("/$reg_exp/i", $content))) {
+               $n_feed = (int) $feed;
 
-                                       array_push($matches, array($filter["action"], $filter["action_param"]));
-                               }
-                       }
+               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+
+               if ($unread_only) {
+                       $unread_qpart = "unread = true";
+               } else {
+                       $unread_qpart = "true";
                }
 
-               if ($filters["both"]) {
-                       foreach ($filters["both"] as $filter) {
-                               $reg_exp = $filter["reg_exp"];
-                               $inverse = $filter["inverse"];
+               $age_qpart = getMaxAgeSubquery();
 
-                               if ($inverse) {
-                                       if (!@preg_match("/$reg_exp/i", $title) && !preg_match("/$reg_exp/i", $content)) {
-                                               array_push($matches, array($filter["action"], $filter["action_param"]));
-                                       }
-                               } else {
-                                       if (@preg_match("/$reg_exp/i", $title) || preg_match("/$reg_exp/i", $content)) {
-                                               array_push($matches, array($filter["action"], $filter["action_param"]));
-                                       }
-                               }
-                       }
-               }
+               if ($is_cat) {
+                       return getCategoryUnread($link, $n_feed, $owner_uid);
+               } if ($feed != "0" && $n_feed == 0) {
 
-               if ($filters["link"]) {
-                       $reg_exp = $filter["reg_exp"];
-                       foreach ($filters["link"] as $filter) {
-                               $reg_exp = $filter["reg_exp"];
-                               $inverse = $filter["inverse"];
+                       $feed = db_escape_string($feed);
 
-                               if ((!$inverse && @preg_match("/$reg_exp/i", $link)) ||
-                                               ($inverse && !@preg_match("/$reg_exp/i", $link))) {
+                       $result = db_query($link, "SELECT SUM((SELECT COUNT(int_id)
+                               FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
+                                       AND ref_id = id AND $age_qpart
+                                       AND $unread_qpart)) AS count FROM ttrss_tags
+                               WHERE owner_uid = $owner_uid AND tag_name = '$feed'");
+                       return db_fetch_result($result, 0, "count");
 
-                                       array_push($matches, array($filter["action"], $filter["action_param"]));
-                               }
-                       }
-               }
+               } 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";
 
-               if ($filters["date"]) {
-                       $reg_exp = $filter["reg_exp"];
-                       foreach ($filters["date"] as $filter) {
-                               $date_modifier = $filter["filter_param"];
-                               $inverse = $filter["inverse"];
-                               $check_timestamp = strtotime($filter["reg_exp"]);
+                       $intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
-                               # no-op when timestamp doesn't parse to prevent misfires
+                       if (DB_TYPE == "pgsql") {
+                               $match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
+                       } else {
+                               $match_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
+                       }
+               } else if ($n_feed == -4) {
+                       $match_part = "true";
+               } else if ($n_feed >= 0) {
 
-                               if ($check_timestamp) {
-                                       $match_ok = false;
+                       if ($n_feed != 0) {
+                               $match_part = "feed_id = '$n_feed'";
+                       } else {
+                               $match_part = "feed_id IS NULL";
+                       }
 
-                                       if ($date_modifier == "before" && $timestamp < $check_timestamp ||
-                                               $date_modifier == "after" && $timestamp > $check_timestamp) {
-                                                       $match_ok = true;
-                                       }
+               } else if ($feed < -10) {
 
-                                       if ($inverse) $match_ok = !$match_ok;
+                       $label_id = -$feed - 11;
+
+                       return getLabelUnread($link, $label_id, $owner_uid);
 
-                                       if ($match_ok) {
-                                               array_push($matches, array($filter["action"], $filter["action_param"]));
-                                       }
-                               }
-                       }
                }
 
-               if ($filters["author"]) {
-                       foreach ($filters["author"] as $filter) {
-                               $reg_exp = $filter["reg_exp"];
-                               $inverse = $filter["inverse"];
-                               if ((!$inverse && @preg_match("/$reg_exp/i", $author)) ||
-                                               ($inverse && !@preg_match("/$reg_exp/i", $author))) {
+               if ($match_part) {
 
-                                       array_push($matches, array($filter["action"], $filter["action_param"]));
-                               }
+                       if ($n_feed != 0) {
+                               $from_qpart = "ttrss_user_entries,ttrss_feeds,ttrss_entries";
+                               $feeds_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
+                       } else {
+                               $from_qpart = "ttrss_user_entries,ttrss_entries";
+                               $feeds_qpart = '';
                        }
-               }
-
-               if ($filters["tag"]) {
 
-                       $tag_string = join(",", $tags);
+                       $query = "SELECT count(int_id) AS unread
+                               FROM $from_qpart WHERE
+                               ttrss_user_entries.ref_id = ttrss_entries.id AND
+                               $age_qpart AND
+                               $feeds_qpart
+                               $unread_qpart AND ($match_part) AND ttrss_user_entries.owner_uid = $owner_uid";
 
-                       foreach ($filters["tag"] as $filter) {
-                               $reg_exp = $filter["reg_exp"];
-                               $inverse = $filter["inverse"];
+                       $result = db_query($link, $query);
 
-                               if ((!$inverse && @preg_match("/$reg_exp/i", $tag_string)) ||
-                                               ($inverse && !@preg_match("/$reg_exp/i", $tag_string))) {
+               } else {
 
-                                       array_push($matches, array($filter["action"], $filter["action_param"]));
-                               }
-                       }
+                       $result = db_query($link, "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 $age_qpart AND
+                                       ttrss_tags.owner_uid = " . $owner_uid);
                }
 
+               $unread = db_fetch_result($result, 0, "unread");
 
-               return $matches;
+               return $unread;
        }
 
-       function find_article_filter($filters, $filter_name) {
-               foreach ($filters as $f) {
-                       if ($f[0] == $filter_name) {
-                               return $f;
-                       };
+       function getGlobalUnread($link, $user_id = false) {
+
+               if (!$user_id) {
+                       $user_id = $_SESSION["uid"];
                }
-               return false;
-       }
 
-       function calculate_article_score($filters) {
-               $score = 0;
+               $result = db_query($link, "SELECT SUM(value) AS c_id FROM ttrss_counters_cache
+                       WHERE owner_uid = '$user_id' AND feed_id > 0");
 
-               foreach ($filters as $f) {
-                       if ($f[0] == "score") {
-                               $score += $f[1];
-                       };
-               }
-               return $score;
-       }
+               $c_id = db_fetch_result($result, 0, "c_id");
 
-       function assign_article_to_labels($link, $id, $filters, $owner_uid) {
-               foreach ($filters as $f) {
-                       if ($f[0] == "label") {
-                               label_add_article($link, $id, $f[1], $owner_uid);
-                       };
-               }
+               return $c_id;
        }
 
-       function getmicrotime() {
-               list($usec, $sec) = explode(" ",microtime());
-               return ((float)$usec + (float)$sec);
-       }
+       function getGlobalCounters($link, $global_unread = -1) {
+               $ret_arr = array();
 
-       function print_radio($id, $default, $true_is, $values, $attributes = "") {
-               foreach ($values as $v) {
+               if ($global_unread == -1) {
+                       $global_unread = getGlobalUnread($link);
+               }
 
-                       if ($v == $default)
-                               $sel = "checked";
-                        else
-                               $sel = "";
+               $cv = array("id" => "global-unread",
+                       "counter" => $global_unread);
 
-                       if ($v == $true_is) {
-                               $sel .= " value=\"1\"";
-                       } else {
-                               $sel .= " value=\"0\"";
-                       }
+               array_push($ret_arr, $cv);
 
-                       print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
-                               type=\"radio\" $sel $attributes name=\"$id\">&nbsp;$v&nbsp;";
+               $result = db_query($link, "SELECT COUNT(id) AS fn FROM
+                       ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
-               }
-       }
+               $subscribed_feeds = db_fetch_result($result, 0, "fn");
 
-       function initialize_user_prefs($link, $uid, $profile = false) {
+               $cv = array("id" => "subscribed-feeds",
+                       "counter" => $subscribed_feeds);
 
-               $uid = db_escape_string($uid);
+               array_push($ret_arr, $cv);
 
-               if (!$profile) {
-                       $profile = "NULL";
-                       $profile_qpart = "AND profile IS NULL";
-               } else {
-                       $profile_qpart = "AND profile = '$profile'";
-               }
+               return $ret_arr;
+       }
 
-               if (get_schema_version($link) < 63) $profile_qpart = "";
+       function getTagCounters($link) {
 
-               db_query($link, "BEGIN");
+               $ret_arr = array();
 
-               $result = db_query($link, "SELECT pref_name,def_value FROM ttrss_prefs");
+               $age_qpart = getMaxAgeSubquery();
 
-               $u_result = db_query($link, "SELECT pref_name
-                       FROM ttrss_user_prefs WHERE owner_uid = '$uid' $profile_qpart");
-
-               $active_prefs = array();
+               $result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id)
+                       FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
+                               AND ref_id = id AND $age_qpart
+                               AND unread = true)) AS count FROM ttrss_tags
+                               WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name
+                               ORDER BY count DESC LIMIT 55");
 
-               while ($line = db_fetch_assoc($u_result)) {
-                       array_push($active_prefs, $line["pref_name"]);
-               }
+               $tags = array();
 
                while ($line = db_fetch_assoc($result)) {
-                       if (array_search($line["pref_name"], $active_prefs) === FALSE) {
-//                             print "adding " . $line["pref_name"] . "<br>";
+                       $tags[$line["tag_name"]] += $line["count"];
+               }
 
-                               if (get_schema_version($link) < 63) {
-                                       db_query($link, "INSERT INTO ttrss_user_prefs
-                                               (owner_uid,pref_name,value) VALUES
-                                               ('$uid', '".$line["pref_name"]."','".$line["def_value"]."')");
+               foreach (array_keys($tags) as $tag) {
+                       $unread = $tags[$tag];
+                       $tag = htmlspecialchars($tag);
 
-                               } else {
-                                       db_query($link, "INSERT INTO ttrss_user_prefs
-                                               (owner_uid,pref_name,value, profile) VALUES
-                                               ('$uid', '".$line["pref_name"]."','".$line["def_value"]."', $profile)");
-                               }
+                       $cv = array("id" => $tag,
+                               "kind" => "tag",
+                               "counter" => $unread);
 
-                       }
+                       array_push($ret_arr, $cv);
                }
 
-               db_query($link, "COMMIT");
-
+               return $ret_arr;
        }
 
-       function get_ssl_certificate_id() {
-               if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
-                       return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
-                               $_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
-                               $_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
-                               $_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
-               }
-               return "";
-       }
+       function getVirtCounters($link) {
 
-       function get_login_by_ssl_certificate($link) {
+               $ret_arr = array();
 
-               $cert_serial = db_escape_string(get_ssl_certificate_id());
+               for ($i = 0; $i >= -4; $i--) {
 
-               if ($cert_serial) {
-                       $result = db_query($link, "SELECT login FROM ttrss_user_prefs, ttrss_users
-                               WHERE pref_name = 'SSL_CERT_SERIAL' AND value = '$cert_serial' AND
-                               owner_uid = ttrss_users.id");
+                       $count = getFeedUnread($link, $i);
 
-                       if (db_num_rows($result) != 0) {
-                               return db_escape_string(db_fetch_result($result, 0, "login"));
-                       }
+                       $cv = array("id" => $i,
+                               "counter" => $count);
+
+//                     if (get_pref($link, 'EXTENDED_FEEDLIST'))
+//                             $cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
+
+                       array_push($ret_arr, $cv);
                }
 
-               return "";
+               return $ret_arr;
        }
 
-       function get_remote_user($link) {
+       function getLabelCounters($link, $descriptions = false) {
 
-               if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH) {
-                       return db_escape_string($_SERVER["REMOTE_USER"]);
-               }
+               $ret_arr = array();
 
-               return db_escape_string(get_login_by_ssl_certificate($link));
-       }
+               $age_qpart = getMaxAgeSubquery();
 
-       function get_remote_fakepass($link) {
-               if (get_remote_user($link))
-                       return "******";
-               else
-                       return "";
-       }
+               $owner_uid = $_SESSION["uid"];
 
-       function authenticate_user($link, $login, $password, $force_auth = false) {
+               $result = db_query($link, "SELECT id, caption FROM ttrss_labels2
+                       WHERE owner_uid = '$owner_uid'");
 
-               if (!SINGLE_USER_MODE) {
+               while ($line = db_fetch_assoc($result)) {
 
-                       $pwd_hash1 = encrypt_password($password);
-                       $pwd_hash2 = encrypt_password($password, $login);
-                       $login = db_escape_string($login);
+                       $id = -$line["id"] - 11;
 
-                       $remote_user = get_remote_user($link);
+                       $label_name = $line["caption"];
+                       $count = getFeedUnread($link, $id);
 
-                       if ($remote_user && $remote_user == $login && $login != "admin") {
+                       $cv = array("id" => $id,
+                               "counter" => $count);
 
-                               $login = $remote_user;
+                       if ($descriptions)
+                               $cv["description"] = $label_name;
 
-                               $query = "SELECT id,login,access_level,pwd_hash
-                   FROM ttrss_users WHERE
-                                       login = '$login'";
+//                     if (get_pref($link, 'EXTENDED_FEEDLIST'))
+//                             $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
 
-                               if (defined('AUTO_CREATE_USER') && AUTO_CREATE_USER
-                                               && $_SERVER["REMOTE_USER"]) {
-                                       $result = db_query($link, $query);
+                       array_push($ret_arr, $cv);
+               }
 
-                                       // First login ?
-                                       if (db_num_rows($result) == 0) {
-                                               $query2 = "INSERT INTO ttrss_users
-                                                               (login,access_level,last_login,created)
-                                                               VALUES ('$login', 0, null, NOW())";
-                                               db_query($link, $query2);
-                                       }
-                               }
+               return $ret_arr;
+       }
 
-                       } else {
-                               $query = "SELECT id,login,access_level,pwd_hash
-                   FROM ttrss_users WHERE
-                                       login = '$login' AND (pwd_hash = '$pwd_hash1' OR
-                                               pwd_hash = '$pwd_hash2')";
-                       }
+       function getFeedCounters($link, $active_feed = false) {
 
-                       $result = db_query($link, $query);
+               $ret_arr = array();
 
-                       if (db_num_rows($result) == 1) {
-                               $_SESSION["uid"] = db_fetch_result($result, 0, "id");
-                               $_SESSION["name"] = db_fetch_result($result, 0, "login");
-                               $_SESSION["access_level"] = db_fetch_result($result, 0, "access_level");
+               $age_qpart = getMaxAgeSubquery();
 
-                               db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
-                                       $_SESSION["uid"]);
+               $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.feed_id = id";
 
+               $result = db_query($link, $query);
+               $fctrs_modified = false;
 
-                               // LemonLDAP can send user informations via HTTP HEADER
-                               if (defined('AUTO_CREATE_USER') && AUTO_CREATE_USER){
-                                       // update user name
-                                       $fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN'];
-                                       if ($fullname){
-                                               $fullname = db_escape_string($fullname);
-                                               db_query($link, "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " .
-                                                       $_SESSION["uid"]);
-                                       }
-                                       // update user mail
-                                       $email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL'];
-                                       if ($email){
-                                               $email = db_escape_string($email);
-                                               db_query($link, "UPDATE ttrss_users SET email = '$email' WHERE id = " .
-                                                       $_SESSION["uid"]);
-                                       }
-                               }
+               while ($line = db_fetch_assoc($result)) {
 
-                               $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
-                               $_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
+                       $id = $line["id"];
+                       $count = $line["count"];
+                       $last_error = htmlspecialchars($line["last_error"]);
 
-                               $_SESSION["last_version_check"] = time();
+                       $last_updated = make_local_datetime($link, $line['last_updated'], false);
 
-                               initialize_user_prefs($link, $_SESSION["uid"]);
+                       $has_img = feed_has_icon($id);
 
-                               return true;
-                       }
+                       if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
+                               $last_updated = '';
 
-                       return false;
+                       $cv = array("id" => $id,
+                               "updated" => $last_updated,
+                               "counter" => $count,
+                               "has_img" => (int) $has_img);
 
-               } else {
+                       if ($last_error)
+                               $cv["error"] = $last_error;
 
-                       $_SESSION["uid"] = 1;
-                       $_SESSION["name"] = "admin";
+//                     if (get_pref($link, 'EXTENDED_FEEDLIST'))
+//                             $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
 
-                       $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
+                       if ($active_feed && $id == $active_feed)
+                               $cv["title"] = truncate_string($line["title"], 30);
 
-                       initialize_user_prefs($link, $_SESSION["uid"]);
+                       array_push($ret_arr, $cv);
 
-                       return true;
                }
+
+               return $ret_arr;
        }
 
-       function make_password($length = 8) {
+       function get_pgsql_version($link) {
+               $result = db_query($link, "SELECT version() AS version");
+               $version = explode(" ", db_fetch_result($result, 0, "version"));
+               return $version[1];
+       }
 
-               $password = "";
-               $possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ";
+       /**
+        * Subscribes the user to the given feed
+        *
+        * @param resource $link       Database connection
+        * @param string   $url        Feed URL to subscribe to
+        * @param integer  $cat_id     Category ID the feed shall be added to
+        * @param string   $auth_login (optional) Feed username
+        * @param string   $auth_pass  (optional) Feed password
+        *
+        * @return integer Status code:
+        *                 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.
+        */
+       function subscribe_to_feed($link, $url, $cat_id = 0,
+                       $auth_login = '', $auth_pass = '') {
 
-       $i = 0;
+               require_once "include/rssfuncs.php";
 
-               while ($i < $length) {
-                       $char = substr($possible, mt_rand(0, strlen($possible)-1), 1);
+               $url = fix_url($url);
 
-                       if (!strstr($password, $char)) {
-                               $password .= $char;
-                               $i++;
-                       }
-               }
-               return $password;
-       }
+               if (!$url || !validate_feed_url($url)) return 2;
 
-       // this is called after user is created to initialize default feeds, labels
-       // or whatever else
+               $update_method = 0;
 
-       // user preferences are checked on every login, not here
+               $result = db_query($link, "SELECT twitter_oauth FROM ttrss_users
+                       WHERE id = ".$_SESSION['uid']);
 
-       function initialize_user($link, $uid) {
+               $has_oauth = db_fetch_result($result, 0, 'twitter_oauth');
 
-               db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
-                       values ('$uid', 'Tiny Tiny RSS: New Releases',
-                       'http://tt-rss.org/releases.rss')");
+               if (!$has_oauth || strpos($url, '://api.twitter.com') === false) {
+                       if (!fetch_file_contents($url, false, $auth_login, $auth_pass)) return 5;
 
-               db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
-                       values ('$uid', 'Tiny Tiny RSS: Forum',
-                               'http://tt-rss.org/forum/rss.php')");
-       }
-
-       function logout_user() {
-               session_destroy();
-               if (isset($_COOKIE[session_name()])) {
-                  setcookie(session_name(), '', time()-42000, '/');
-               }
-       }
-
-       function validate_session($link) {
-               if (SINGLE_USER_MODE) return true;
-
-               $check_ip = $_SESSION['ip_address'];
+                       if (url_is_html($url, $auth_login, $auth_pass)) {
+                               $feedUrls = get_feeds_from_html($url, $auth_login, $auth_pass);
+                               if (count($feedUrls) == 0) {
+                                       return 3;
+                               } else if (count($feedUrls) > 1) {
+                                       return 4;
+                               }
+                               //use feed url as new URL
+                               $url = key($feedUrls);
+                       }
 
-               switch (SESSION_CHECK_ADDRESS) {
-               case 0:
-                       $check_ip = '';
-                       break;
-               case 1:
-                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
-                       break;
-               case 2:
-                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.'));
-                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
-                       break;
-               };
+                       } else {
+                               if (!fetch_twitter_rss($link, $url, $_SESSION['uid']))
+                                       return 5;
 
-               if ($check_ip && strpos($_SERVER['REMOTE_ADDR'], $check_ip) !== 0) {
-                       $_SESSION["login_error_msg"] =
-                               __("Session failed to validate (incorrect IP)");
-                       return false;
+                               $update_method = 3;
+                       }
+               if ($cat_id == "0" || !$cat_id) {
+                       $cat_qpart = "NULL";
+               } else {
+                       $cat_qpart = "'$cat_id'";
                }
 
-               if ($_SESSION["ref_schema_version"] != get_schema_version($link, true))
-                       return false;
-
-               if ($_SESSION["uid"]) {
+               $result = db_query($link,
+                       "SELECT id FROM ttrss_feeds
+                       WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]);
 
+               if (db_num_rows($result) == 0) {
                        $result = db_query($link,
-                               "SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");
-
-                       $pwd_hash = db_fetch_result($result, 0, "pwd_hash");
-
-                       if ($pwd_hash != $_SESSION["pwd_hash"]) {
-                               return false;
-                       }
-               }
+                               "INSERT INTO ttrss_feeds
+                                       (owner_uid,feed_url,title,cat_id, auth_login,auth_pass,update_method)
+                               VALUES ('".$_SESSION["uid"]."', '$url',
+                               '[Unknown]', $cat_qpart, '$auth_login', '$auth_pass', '$update_method')");
 
-/*             if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) {
+                       $result = db_query($link,
+                               "SELECT id FROM ttrss_feeds WHERE feed_url = '$url'
+                                       AND owner_uid = " . $_SESSION["uid"]);
 
-                       //print_r($_SESSION);
+                       $feed_id = db_fetch_result($result, 0, "id");
 
-                       if (time() > $_SESSION["cookie_lifetime"]) {
-                               return false;
+                       if ($feed_id) {
+                               update_rss_feed($link, $feed_id, true);
                        }
-               } */
 
-               return true;
+                       return 1;
+               } else {
+                       return 0;
+               }
        }
 
-       function login_sequence($link, $mobile = false) {
-               $_SESSION["prefs_cache"] = array();
-
-               if (!SINGLE_USER_MODE) {
+       function print_feed_select($link, $id, $default_id = "",
+               $attributes = "", $include_all_feeds = true) {
 
-                       $login_action = $_POST["login_action"];
+               print "<select id=\"$id\" name=\"$id\" $attributes>";
+               if ($include_all_feeds) {
+                       print "<option value=\"0\">".__('All feeds')."</option>";
+               }
 
-                       # try to authenticate user if called from login form
-                       if ($login_action == "do_login") {
-                               $login = db_escape_string($_POST["login"]);
-                               $password = $_POST["password"];
-                               $remember_me = $_POST["remember_me"];
+               $result = db_query($link, "SELECT id,title FROM ttrss_feeds
+                       WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
-                               if (authenticate_user($link, $login, $password)) {
-                                       $_POST["password"] = "";
+               if (db_num_rows($result) > 0 && $include_all_feeds) {
+                       print "<option disabled>--------</option>";
+               }
 
-                                       $_SESSION["language"] = $_POST["language"];
-                                       $_SESSION["ref_schema_version"] = get_schema_version($link, true);
-                                       $_SESSION["bw_limit"] = !!$_POST["bw_limit"];
+               while ($line = db_fetch_assoc($result)) {
+                       if ($line["id"] == $default_id) {
+                               $is_selected = "selected=\"1\"";
+                       } else {
+                               $is_selected = "";
+                       }
 
-                                       if ($_POST["profile"]) {
+                       $title = truncate_string(htmlspecialchars($line["title"]), 40);
 
-                                               $profile = db_escape_string($_POST["profile"]);
+                       printf("<option $is_selected value='%d'>%s</option>",
+                               $line["id"], $title);
+               }
 
-                                               $result = db_query($link, "SELECT id FROM ttrss_settings_profiles
-                                                       WHERE id = '$profile' AND owner_uid = " . $_SESSION["uid"]);
+               print "</select>";
+       }
 
-                                               if (db_num_rows($result) != 0) {
-                                                       $_SESSION["profile"] = $profile;
-                                                       $_SESSION["prefs_cache"] = array();
-                                               }
-                                       }
+       function print_feed_cat_select($link, $id, $default_id = "",
+               $attributes = "", $include_all_cats = true) {
 
-                                       if ($_REQUEST['return']) {
-                                               header("Location: " . $_REQUEST['return']);
-                                       } else {
-                                               header("Location: " . $_SERVER["REQUEST_URI"]);
-                                       }
+               print "<select id=\"$id\" name=\"$id\" default=\"$default_id\" onchange=\"catSelectOnChange(this)\" $attributes>";
 
-                                       exit;
+               if ($include_all_cats) {
+                       print "<option value=\"0\">".__('Uncategorized')."</option>";
+               }
 
-                                       return;
-                               } else {
-                                       $_SESSION["login_error_msg"] = __("Incorrect username or password");
-                               }
-                       }
+               $result = db_query($link, "SELECT id,title FROM ttrss_feed_categories
+                       WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
-                       if (!$_SESSION["uid"] || !validate_session($link)) {
+               if (db_num_rows($result) > 0 && $include_all_cats) {
+                       print "<option disabled=\"1\">--------</option>";
+               }
 
-                               if (get_remote_user($link) && AUTO_LOGIN) {
-                                   authenticate_user($link, get_remote_user($link), null);
-                                   $_SESSION["ref_schema_version"] = get_schema_version($link, true);
-                               } else {
-                                   render_login_form($link, $mobile);
-                                   //header("Location: login.php");
-                                   exit;
-                               }
+               while ($line = db_fetch_assoc($result)) {
+                       if ($line["id"] == $default_id) {
+                               $is_selected = "selected=\"1\"";
                        } else {
-                               /* bump login timestamp */
-                               db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
-                                       $_SESSION["uid"]);
-
-                               if ($_SESSION["language"] && SESSION_COOKIE_LIFETIME > 0) {
-                                       setcookie("ttrss_lang", $_SESSION["language"],
-                                               time() + SESSION_COOKIE_LIFETIME);
-                               }
-
-                               // try to remove possible duplicates from feed counter cache
-//                             ccache_cleanup($link, $_SESSION["uid"]);
+                               $is_selected = "";
                        }
 
-               } else {
-                       return authenticate_user($link, "admin", null);
+                       if ($line["title"])
+                               printf("<option $is_selected value='%d'>%s</option>",
+                                       $line["id"], htmlspecialchars($line["title"]));
                }
-       }
 
-       function truncate_string($str, $max_len, $suffix = '&hellip;') {
-               if (mb_strlen($str, "utf-8") > $max_len - 3) {
-                       return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
-               } else {
-                       return $str;
-               }
+#              print "<option value=\"ADD_CAT\">" .__("Add category...") . "</option>";
+
+               print "</select>";
        }
 
-       function theme_image($link, $filename) {
-               if ($link) {
-                       $theme_path = get_user_theme_path($link);
+       function checkbox_to_sql_bool($val) {
+               return ($val == "on") ? "true" : "false";
+       }
 
-                       if ($theme_path && is_file($theme_path.$filename)) {
-                               return $theme_path.$filename;
+       function getFeedCatTitle($link, $id) {
+               if ($id == -1) {
+                       return __("Special");
+               } else if ($id < -10) {
+                       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
+                                       cat_id = ttrss_feed_categories.id");
+                       if (db_num_rows($result) == 1) {
+                               return db_fetch_result($result, 0, "title");
                        } else {
-                               return $filename;
+                               return __("Uncategorized");
                        }
                } else {
-                       return $filename;
+                       return "getFeedCatTitle($id) failed";
                }
-       }
 
-       function get_user_theme($link) {
+       }
 
-               if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
-                       $theme_name = get_pref($link, "_THEME_ID");
-                       if (is_dir("themes/$theme_name")) {
-                               return $theme_name;
+       function getFeedIcon($id) {
+               switch ($id) {
+               case 0:
+                       return "images/archive.png";
+                       break;
+               case -1:
+                       return "images/mark_set.png";
+                       break;
+               case -2:
+                       return "images/pub_set.png";
+                       break;
+               case -3:
+                       return "images/fresh.png";
+                       break;
+               case -4:
+                       return "images/tag.png";
+                       break;
+               default:
+                       if ($id < -10) {
+                               return "images/label.png";
                        } else {
-                               return '';
+                               if (file_exists(ICONS_DIR . "/$id.ico"))
+                                       return ICONS_URL . "/$id.ico";
                        }
-               } else {
-                       return '';
+                       break;
                }
-
        }
 
-       function get_user_theme_path($link) {
-               $theme_path = '';
-
-               if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
-                       $theme_name = get_pref($link, "_THEME_ID");
-
-                       if ($theme_name && is_dir("themes/$theme_name")) {
-                               $theme_path = "themes/$theme_name/";
+       function getFeedTitle($link, $id) {
+               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 < -10) {
+                       $label_id = -$id - 11;
+                       $result = db_query($link, "SELECT caption FROM ttrss_labels2 WHERE id = '$label_id'");
+                       if (db_num_rows($result) == 1) {
+                               return db_fetch_result($result, 0, "caption");
                        } else {
-                               $theme_name = '';
-                       }
-               } else {
-                       $theme_path = '';
-               }
-
-               if ($theme_path) {
-                       if (is_file("$theme_path/theme.ini")) {
-                               $ini = parse_ini_file("$theme_path/theme.ini", true);
-                               if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED) {
-                                       return $theme_path;
-                               }
+                               return "Unknown label ($label_id)";
                        }
-               }
-               return '';
-       }
-
-       function get_user_theme_options($link) {
-               $t = get_user_theme_path($link);
 
-               if ($t) {
-                       if (is_file("$t/theme.ini")) {
-                               $ini = parse_ini_file("$t/theme.ini", true);
-                               if ($ini['theme']['version']) {
-                                       return $ini['theme']['options'];
-                               }
+               } else if (is_numeric($id) && $id > 0) {
+                       $result = db_query($link, "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;
                }
-               return '';
        }
 
-       function print_theme_includes($link) {
+       function make_init_params($link) {
+               $params = array();
 
-               $t = get_user_theme_path($link);
-               $time = time();
+               $params["theme"] = get_user_theme($link);
+               $params["theme_options"] = get_user_theme_options($link);
 
-               if ($t) {
-                       print "<link rel=\"stylesheet\" type=\"text/css\"
-                               href=\"$t/theme.css?$time \">";
-                       if (file_exists("$t/theme.js")) {
-                               print "<script type=\"text/javascript\" src=\"$t/theme.js?$time\">
-                                       </script>";
-                       }
-               }
-       }
+               $params["sign_progress"] = theme_image($link, "images/indicator_white.gif");
+               $params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif");
+               $params["sign_excl"] = theme_image($link, "images/sign_excl.png");
+               $params["sign_info"] = theme_image($link, "images/sign_info.png");
 
-       function get_all_themes() {
-               $themes = glob("themes/*");
+               foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
+                       "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
+                       "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT",
+                       "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
 
-               asort($themes);
+                                $params[strtolower($param)] = (int) get_pref($link, $param);
+                }
 
-               $rv = array();
+               $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["bw_limit"] = (int) $_SESSION["bw_limit"];
 
-               foreach ($themes as $t) {
-                       if (is_file("$t/theme.ini")) {
-                               $ini = parse_ini_file("$t/theme.ini", true);
-                               if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED &&
-                                                       !$ini['theme']['disabled']) {
-                                       $entry = array();
-                                       $entry["path"] = $t;
-                                       $entry["base"] = basename($t);
-                                       $entry["name"] = $ini['theme']['name'];
-                                       $entry["version"] = $ini['theme']['version'];
-                                       $entry["author"] = $ini['theme']['author'];
-                                       $entry["options"] = $ini['theme']['options'];
-                                       array_push($rv, $entry);
-                               }
-                       }
-               }
+               $result = db_query($link, "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
+                       ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
-               return $rv;
-       }
+               $max_feed_id = db_fetch_result($result, 0, "mid");
+               $num_feeds = db_fetch_result($result, 0, "nf");
 
-       function convert_timestamp($timestamp, $source_tz, $dest_tz) {
+               $params["max_feed_id"] = (int) $max_feed_id;
+               $params["num_feeds"] = (int) $num_feeds;
 
-               try {
-                       $source_tz = new DateTimeZone($source_tz);
-               } catch (Exception $e) {
-                       $source_tz = new DateTimeZone('UTC');
-               }
+               $params["collapsed_feedlist"] = (int) get_pref($link, "_COLLAPSED_FEEDLIST");
 
-               try {
-                       $dest_tz = new DateTimeZone($dest_tz);
-               } catch (Exception $e) {
-                       $dest_tz = new DateTimeZone('UTC');
-               }
+               $params["csrf_token"] = $_SESSION["csrf_token"];
 
-               $dt = new DateTime(date('Y-m-d H:i:s', $timestamp), $source_tz);
-               return $dt->format('U') + $dest_tz->getOffset($dt);
+               return $params;
        }
 
-       function make_local_datetime($link, $timestamp, $long, $owner_uid = false,
-                                       $no_smart_dt = false) {
+       function make_runtime_info($link) {
+               $data = array();
 
-               if (!$owner_uid) $owner_uid = $_SESSION['uid'];
-               if (!$timestamp) $timestamp = '1970-01-01 0:00';
+               $result = db_query($link, "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
+                       ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
-               global $utc_tz;
-               global $tz_offset;
+               $max_feed_id = db_fetch_result($result, 0, "mid");
+               $num_feeds = db_fetch_result($result, 0, "nf");
 
-               # We store date in UTC internally
-               $dt = new DateTime($timestamp, $utc_tz);
+               $data["max_feed_id"] = (int) $max_feed_id;
+               $data["num_feeds"] = (int) $num_feeds;
 
-               if ($tz_offset == -1) {
+               $data['last_article_id'] = getLastArticleId($link);
+               $data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED');
 
-                       $user_tz_string = get_pref($link, 'USER_TIMEZONE', $owner_uid);
+               if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
 
-                       try {
-                               $user_tz = new DateTimeZone($user_tz_string);
-                       } catch (Exception $e) {
-                               $user_tz = $utc_tz;
-                       }
+                       $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
 
-                       $tz_offset = $user_tz->getOffset($dt);
-               }
+                       if (time() - $_SESSION["daemon_stamp_check"] > 30) {
 
-               $user_timestamp = $dt->format('U') + $tz_offset;
+                               $stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
 
-               if (!$no_smart_dt) {
-                       return smart_date_time($link, $user_timestamp,
-                               $tz_offset, $owner_uid);
-               } else {
-                       if ($long)
-                               $format = get_pref($link, 'LONG_DATE_FORMAT', $owner_uid);
-                       else
-                               $format = get_pref($link, 'SHORT_DATE_FORMAT', $owner_uid);
+                               if ($stamp) {
+                                       $stamp_delta = time() - $stamp;
 
-                       return date($format, $user_timestamp);
-               }
-       }
+                                       if ($stamp_delta > 1800) {
+                                               $stamp_check = 0;
+                                       } else {
+                                               $stamp_check = 1;
+                                               $_SESSION["daemon_stamp_check"] = time();
+                                       }
 
-       function smart_date_time($link, $timestamp, $tz_offset = 0, $owner_uid = false) {
-               if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+                                       $data['daemon_stamp_ok'] = $stamp_check;
 
-               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);
-                       return date($format, $timestamp);
-               } else {
-                       $format = get_pref($link, 'LONG_DATE_FORMAT', $owner_uid);
-                       return date($format, $timestamp);
-               }
-       }
+                                       $stamp_fmt = date("Y.m.d, G:i", $stamp);
 
-       function sql_bool_to_bool($s) {
-               if ($s == "t" || $s == "1" || $s == "true") {
-                       return true;
-               } else {
-                       return false;
+                                       $data['daemon_stamp'] = $stamp_fmt;
+                               }
+                       }
                }
-       }
 
-       function bool_to_sql_bool($s) {
-               if ($s) {
-                       return "true";
-               } else {
-                       return "false";
-               }
-       }
+               if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
+                               $new_version_details = @check_for_update($link);
 
-       // 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) {
-               global $schema_version;
+                               $data['new_version_available'] = (int) ($new_version_details != false);
 
-               if (!$schema_version) {
-                       $result = db_query($link, "SELECT schema_version FROM ttrss_version");
-                       $version = db_fetch_result($result, 0, "schema_version");
-                       $schema_version = $version;
-                       return $version;
-               } else {
-                       return $schema_version;
+                               $_SESSION["last_version_check"] = time();
                }
+
+               return $data;
        }
 
-       function sanity_check($link) {
-               require_once 'errors.php';
+       function search_to_sql($link, $search, $match_on) {
 
-               $error_code = 0;
-               $schema_version = get_schema_version($link, true);
+               $search_query_part = "";
 
-               if ($schema_version != SCHEMA_VERSION) {
-                       $error_code = 5;
-               }
+               $keywords = explode(" ", $search);
+               $query_keywords = array();
 
-               if (DB_TYPE == "mysql") {
-                       $result = db_query($link, "SELECT true", false);
-                       if (db_num_rows($result) != 1) {
-                               $error_code = 10;
+               foreach ($keywords as $k) {
+                       if (strpos($k, "-") === 0) {
+                               $k = substr($k, 1);
+                               $not = "NOT";
+                       } else {
+                               $not = "";
                        }
-               }
 
-               if (db_escape_string("testTEST") != "testTEST") {
-                       $error_code = 12;
-               }
+                       $commandpair = explode(":", mb_strtolower($k), 2);
 
-               return array("code" => $error_code, "message" => $ERRORS[$error_code]);
-       }
+                       if ($commandpair[0] == "note" && $commandpair[1]) {
 
-       function file_is_locked($filename) {
-               if (function_exists('flock')) {
-                       $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
-                       if ($fp) {
-                               if (flock($fp, LOCK_EX | LOCK_NB)) {
-                                       flock($fp, LOCK_UN);
-                                       fclose($fp);
-                                       return false;
-                               }
-                               fclose($fp);
-                               return true;
-                       } else {
-                               return false;
-                       }
-               }
-               return true; // consider the file always locked and skip the test
-       }
+                               if ($commandpair[1] == "true")
+                                       array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+                               else
+                                       array_push($query_keywords, "($not (note IS NULL OR note = ''))");
 
-       function make_lockfile($filename) {
-               $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+                       } else if ($commandpair[0] == "star" && $commandpair[1]) {
 
-               if (flock($fp, LOCK_EX | LOCK_NB)) {
-                       if (function_exists('posix_getpid')) {
-                               fwrite($fp, posix_getpid() . "\n");
-                       }
-                       return $fp;
-               } else {
-                       return false;
-               }
-       }
+                               if ($commandpair[1] == "true")
+                                       array_push($query_keywords, "($not (marked = true))");
+                               else
+                                       array_push($query_keywords, "($not (marked = false))");
 
-       function make_stampfile($filename) {
-               $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+                       } else if ($commandpair[0] == "pub" && $commandpair[1]) {
 
-               if (flock($fp, LOCK_EX | LOCK_NB)) {
-                       fwrite($fp, time() . "\n");
-                       flock($fp, LOCK_UN);
-                       fclose($fp);
-                       return true;
-               } else {
-                       return false;
-               }
-       }
+                               if ($commandpair[1] == "true")
+                                       array_push($query_keywords, "($not (published = true))");
+                               else
+                                       array_push($query_keywords, "($not (published = false))");
 
-       function sql_random_function() {
-               if (DB_TYPE == "mysql") {
-                       return "RAND()";
-               } else {
-                       return "RANDOM()";
-               }
-       }
+                       } else if (strpos($k, "@") === 0) {
 
-       function catchup_feed($link, $feed, $cat_view, $owner_uid = false) {
+                               $user_tz_string = get_pref($link, 'USER_TIMEZONE', $_SESSION['uid']);
+                               $orig_ts = strtotime(substr($k, 1));
+                               $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
 
-                       if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+                               //$k = date("Y-m-d", strtotime(substr($k, 1)));
 
-                       //if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
+                               array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
+                       } else if ($match_on == "both") {
+                               array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+                                               OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
+                       } else if ($match_on == "title") {
+                               array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%'))");
+                       } else if ($match_on == "content") {
+                               array_push($query_keywords, "(UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
+                       }
+               }
 
-                       if (is_numeric($feed)) {
-                               if ($cat_view) {
+               $search_query_part = implode("AND", $query_keywords);
 
-                                       if ($feed >= 0) {
+               return $search_query_part;
+       }
 
-                                               if ($feed > 0) {
-                                                       $cat_qpart = "cat_id = '$feed'";
-                                               } else {
-                                                       $cat_qpart = "cat_id IS NULL";
-                                               }
 
-                                               $tmp_result = db_query($link, "SELECT id
-                                                       FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = $owner_uid");
+       function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0) {
 
-                                               while ($tmp_line = db_fetch_assoc($tmp_result)) {
+               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-                                                       $tmp_feed = $tmp_line["id"];
+               $ext_tables_part = "";
 
-                                                       db_query($link, "UPDATE ttrss_user_entries
-                                                               SET unread = false,last_read = NOW()
-                                                               WHERE feed_id = '$tmp_feed' AND owner_uid = $owner_uid");
-                                               }
-                                       } else if ($feed == -2) {
+                       if ($search) {
 
-                                               db_query($link, "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 owner_uid = $owner_uid");
-                                       }
+                               if (SPHINX_ENABLED) {
+                                       $ids = join(",", @sphinx_search($search, 0, 500));
 
-                               } else if ($feed > 0) {
+                                       if ($ids)
+                                               $search_query_part = "ref_id IN ($ids) AND ";
+                                       else
+                                               $search_query_part = "ref_id = -1 AND ";
 
-                                       db_query($link, "UPDATE ttrss_user_entries
-                                                       SET unread = false,last_read = NOW()
-                                                       WHERE feed_id = '$feed' AND owner_uid = $owner_uid");
+                               } else {
+                                       $search_query_part = search_to_sql($link, $search, $match_on);
+                                       $search_query_part .= " AND ";
+                               }
 
-                               } else if ($feed < 0 && $feed > -10) { // special, like starred
+                       } else {
+                               $search_query_part = "";
+                       }
 
-                                       if ($feed == -1) {
-                                               db_query($link, "UPDATE ttrss_user_entries
-                                                       SET unread = false,last_read = NOW()
-                                                       WHERE marked = true AND owner_uid = $owner_uid");
-                                       }
+                       if ($filter) {
+                               $filter_query_part = filter_to_sql($filter);
+                       } else {
+                               $filter_query_part = "";
+                       }
 
-                                       if ($feed == -2) {
-                                               db_query($link, "UPDATE ttrss_user_entries
-                                                       SET unread = false,last_read = NOW()
-                                                       WHERE published = true AND owner_uid = $owner_uid");
-                                       }
+                       if ($since_id) {
+                               $since_id_part = "ttrss_entries.id > $since_id AND ";
+                       } else {
+                               $since_id_part = "";
+                       }
 
-                                       if ($feed == -3) {
+                       $view_query_part = "";
 
-                                               $intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
+                       if ($view_mode == "adaptive" || $view_query_part == "noscores") {
+                               if ($search) {
+                                       $view_query_part = " ";
+                               } else if ($feed != -1) {
+                                       $unread = getFeedUnread($link, $feed, $cat_view);
+                                       if ($unread > 0) {
+                                               $view_query_part = " unread = true AND ";
+                                       }
+                               }
+                       }
 
-                                               if (DB_TYPE == "pgsql") {
-                                                       $match_part = "updated > NOW() - INTERVAL '$intl hour' ";
-                                               } else {
-                                                       $match_part = "updated > DATE_SUB(NOW(),
-                                                               INTERVAL $intl HOUR) ";
-                                               }
+                       if ($view_mode == "marked") {
+                               $view_query_part = " marked = true AND ";
+                       }
 
-                                               $result = db_query($link, "SELECT id FROM ttrss_entries,
-                                                       ttrss_user_entries WHERE $match_part AND
-                                                       unread = true AND
-                                                       ttrss_user_entries.ref_id = ttrss_entries.id AND
-                                                       owner_uid = $owner_uid");
+                       if ($view_mode == "published") {
+                               $view_query_part = " published = true AND ";
+                       }
 
-                                               $affected_ids = array();
+                       if ($view_mode == "unread") {
+                               $view_query_part = " unread = true AND ";
+                       }
 
-                                               while ($line = db_fetch_assoc($result)) {
-                                                       array_push($affected_ids, $line["id"]);
-                                               }
+                       if ($view_mode == "updated") {
+                               $view_query_part = " (last_read is null and unread = false) AND ";
+                       }
 
-                                               catchupArticlesById($link, $affected_ids, 0);
-                                       }
+                       if ($limit > 0) {
+                               $limit_query_part = "LIMIT " . $limit;
+                       }
 
-                                       if ($feed == -4) {
-                                               db_query($link, "UPDATE ttrss_user_entries
-                                                       SET unread = false,last_read = NOW()
-                                                       WHERE owner_uid = $owner_uid");
-                                       }
+                       $vfeed_query_part = "";
 
-                               } else if ($feed < -10) { // label
+                       // override query strategy and enable feed display when searching globally
+                       if ($search && $search_mode == "all_feeds") {
+                               $query_strategy_part = "ttrss_entries.id > 0";
+                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+                       /* tags */
+                       } else if (preg_match("/^-?[0-9][0-9]*$/", $feed) == false) {
+                               $query_strategy_part = "ttrss_entries.id > 0";
+                               $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
+                                       id = feed_id) as feed_title,";
+                       } else if ($feed > 0 && $search && $search_mode == "this_cat") {
 
-                                       $label_id = -$feed - 11;
+                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
 
-                                       db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2
-                                               SET unread = false, last_read = NOW()
-                                                       WHERE label_id = '$label_id' AND unread = true
-                                                       AND owner_uid = '$owner_uid' AND ref_id = article_id");
+                               $tmp_result = false;
 
+                               if ($cat_view) {
+                                       $tmp_result = db_query($link, "SELECT id
+                                               FROM ttrss_feeds WHERE cat_id = '$feed'");
+                               } else {
+                                       $tmp_result = db_query($link, "SELECT id
+                                               FROM ttrss_feeds WHERE cat_id = (SELECT cat_id FROM ttrss_feeds
+                                                       WHERE id = '$feed') AND id != '$feed'");
                                }
 
-                               ccache_update($link, $feed, $owner_uid, $cat_view);
-
-                       } else { // tag
-                               db_query($link, "BEGIN");
+                               $cat_siblings = array();
 
-                               $tag_name = db_escape_string($feed);
+                               if (db_num_rows($tmp_result) > 0) {
+                                       while ($p = db_fetch_assoc($tmp_result)) {
+                                               array_push($cat_siblings, "feed_id = " . $p["id"]);
+                                       }
 
-                               $result = db_query($link, "SELECT post_int_id FROM ttrss_tags
-                                       WHERE tag_name = '$tag_name' AND owner_uid = $owner_uid");
+                                       $query_strategy_part = sprintf("(feed_id = %d OR %s)",
+                                               $feed, implode(" OR ", $cat_siblings));
 
-                               while ($line = db_fetch_assoc($result)) {
-                                       db_query($link, "UPDATE ttrss_user_entries SET
-                                               unread = false, last_read = NOW()
-                                               WHERE int_id = " . $line["post_int_id"]);
+                               } else {
+                                       $query_strategy_part = "ttrss_entries.id > 0";
                                }
-                               db_query($link, "COMMIT");
-                       }
-       }
 
-       function getAllCounters($link, $omode = "flc", $active_feed = false) {
+                       } else if ($feed > 0) {
 
-               if (!$omode) $omode = "flc";
+                               if ($cat_view) {
 
-               $data = getGlobalCounters($link);
+                                       if ($feed > 0) {
+                                               $query_strategy_part = "cat_id = '$feed'";
+                                       } else {
+                                               $query_strategy_part = "cat_id IS NULL";
+                                       }
 
-               $data = array_merge($data, getVirtCounters($link));
+                                       $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
 
-               if (strchr($omode, "l")) $data = array_merge($data, getLabelCounters($link));
-               if (strchr($omode, "f")) $data = array_merge($data, getFeedCounters($link, $active_feed));
-               if (strchr($omode, "t")) $data = array_merge($data, getTagCounters($link));
-               if (strchr($omode, "c")) $data = array_merge($data, getCategoryCounters($link));
-
-               return $data;
-       }
-
-       function getCategoryCounters($link) {
-               $ret_arr = array();
-
-               /* Labels category */
-
-               $cv = array("id" => -2, "kind" => "cat",
-                       "counter" => getCategoryUnread($link, -2));
-
-               array_push($ret_arr, $cv);
-
-               $age_qpart = getMaxAgeSubquery();
-
-               $result = db_query($link, "SELECT id AS cat_id, value AS unread
-                       FROM ttrss_feed_categories, ttrss_cat_counters_cache
-                       WHERE ttrss_cat_counters_cache.feed_id = id AND
-                       ttrss_feed_categories.owner_uid = " . $_SESSION["uid"]);
+                               } else {
+                                       $query_strategy_part = "feed_id = '$feed'";
+                               }
+                       } else if ($feed == 0 && !$cat_view) { // archive virtual feed
+                               $query_strategy_part = "feed_id IS NULL";
+                       } else if ($feed == 0 && $cat_view) { // uncategorized
+                               $query_strategy_part = "cat_id IS NULL";
+                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+                       } else if ($feed == -1) { // starred virtual feed
+                               $query_strategy_part = "marked = true";
+                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+                       } else if ($feed == -2) { // published virtual feed OR labels category
 
-               while ($line = db_fetch_assoc($result)) {
-                       $line["cat_id"] = (int) $line["cat_id"];
+                               if (!$cat_view) {
+                                       $query_strategy_part = "published = true";
+                                       $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+                               } else {
+                                       $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
 
-                       $cv = array("id" => $line["cat_id"], "kind" => "cat",
-                               "counter" => $line["unread"]);
+                                       $ext_tables_part = ",ttrss_labels2,ttrss_user_labels2";
 
-                       array_push($ret_arr, $cv);
-               }
+                                       $query_strategy_part = "ttrss_labels2.id = ttrss_user_labels2.label_id AND
+                                               ttrss_user_labels2.article_id = ref_id";
 
-               /* Special case: NULL category doesn't actually exist in the DB */
+                               }
 
-               $cv = array("id" => 0, "kind" => "cat",
-                       "counter" => ccache_find($link, 0, $_SESSION["uid"], true));
+                       } else if ($feed == -3) { // fresh virtual feed
+                               $query_strategy_part = "unread = true AND score >= 0";
 
-               array_push($ret_arr, $cv);
+                               $intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
-               return $ret_arr;
-       }
+                               if (DB_TYPE == "pgsql") {
+                                       $query_strategy_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
+                               } else {
+                                       $query_strategy_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
+                               }
 
-       function getCategoryUnread($link, $cat, $owner_uid = false) {
+                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+                       } else if ($feed == -4) { // all articles virtual feed
+                               $query_strategy_part = "true";
+                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+                       } else if ($feed <= -10) { // labels
+                               $label_id = -$feed - 11;
 
-               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+                               $query_strategy_part = "label_id = '$label_id' AND
+                                       ttrss_labels2.id = ttrss_user_labels2.label_id AND
+                                       ttrss_user_labels2.article_id = ref_id";
 
-               if ($cat >= 0) {
+                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+                               $ext_tables_part = ",ttrss_labels2,ttrss_user_labels2";
 
-                       if ($cat != 0) {
-                               $cat_query = "cat_id = '$cat'";
                        } else {
-                               $cat_query = "cat_id IS NULL";
-                       }
-
-                       $age_qpart = getMaxAgeSubquery();
-
-                       $result = db_query($link, "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($link, "SELECT COUNT(int_id) AS unread
-                               FROM ttrss_user_entries,ttrss_entries
-                               WHERE   unread = true AND ($match_part) AND id = ref_id
-                               AND $age_qpart AND owner_uid = " . $owner_uid);
-
-                       $unread = 0;
-
-                       # this needs to be rewritten
-                       while ($line = db_fetch_assoc($result)) {
-                               $unread += $line["unread"];
+                               $query_strategy_part = "id > 0"; // dumb
                        }
 
-                       return $unread;
-               } else if ($cat == -1) {
-                       return getFeedUnread($link, -1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0);
-               } else if ($cat == -2) {
-
-                       $result = db_query($link, "
-                               SELECT COUNT(unread) AS unread FROM
-                                       ttrss_user_entries, ttrss_labels2, ttrss_user_labels2, ttrss_feeds
-                               WHERE label_id = ttrss_labels2.id AND article_id = ref_id AND
-                                       ttrss_labels2.owner_uid = '$owner_uid'
-                                       AND unread = true AND feed_id = ttrss_feeds.id
-                                       AND ttrss_user_entries.owner_uid = '$owner_uid'");
-
-                       $unread = db_fetch_result($result, 0, "unread");
-
-                       return $unread;
-
-               }
-       }
-
-       function getMaxAgeSubquery($days = COUNTERS_MAX_AGE) {
-               if (DB_TYPE == "pgsql") {
-                       return "ttrss_entries.date_updated >
-                               NOW() - INTERVAL '$days days'";
-               } else {
-                       return "ttrss_entries.date_updated >
-                               DATE_SUB(NOW(), INTERVAL $days DAY)";
-               }
-       }
-
-       function getFeedUnread($link, $feed, $is_cat = false) {
-               return getFeedArticles($link, $feed, $is_cat, true, $_SESSION["uid"]);
-       }
-
-       function getLabelUnread($link, $label_id, $owner_uid = false) {
-               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-
-               $result = db_query($link, "
-                       SELECT COUNT(unread) AS unread FROM
-                               ttrss_user_entries, ttrss_labels2, ttrss_user_labels2, ttrss_feeds
-                       WHERE label_id = ttrss_labels2.id AND article_id = ref_id AND
-                               ttrss_labels2.owner_uid = '$owner_uid' AND ttrss_labels2.id = '$label_id'
-                               AND unread = true AND feed_id = ttrss_feeds.id
-                               AND ttrss_user_entries.owner_uid = '$owner_uid'");
-
-               if (db_num_rows($result) != 0) {
-                       return db_fetch_result($result, 0, "unread");
-               } else {
-                       return 0;
-               }
-       }
-
-       function getFeedArticles($link, $feed, $is_cat = false, $unread_only = false,
-               $owner_uid = false) {
-
-               $n_feed = (int) $feed;
-
-               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-
-               if ($unread_only) {
-                       $unread_qpart = "unread = true";
-               } else {
-                       $unread_qpart = "true";
-               }
-
-               $age_qpart = getMaxAgeSubquery();
-
-               if ($is_cat) {
-                       return getCategoryUnread($link, $n_feed, $owner_uid);
-               } if ($feed != "0" && $n_feed == 0) {
-
-                       $feed = db_escape_string($feed);
-
-                       $result = db_query($link, "SELECT SUM((SELECT COUNT(int_id)
-                               FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
-                                       AND ref_id = id AND $age_qpart
-                                       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($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
-
-                       if (DB_TYPE == "pgsql") {
-                               $match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
+                       if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
+                               $date_sort_field = "updated";
                        } else {
-                               $match_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
+                               $date_sort_field = "date_entered";
                        }
-               } else if ($n_feed == -4) {
-                       $match_part = "true";
-               } else if ($n_feed >= 0) {
 
-                       if ($n_feed != 0) {
-                               $match_part = "feed_id = '$n_feed'";
+                       if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
+                               $order_by = "$date_sort_field";
                        } else {
-                               $match_part = "feed_id IS NULL";
+                               $order_by = "$date_sort_field DESC";
                        }
 
-               } else if ($feed < -10) {
-
-                       $label_id = -$feed - 11;
-
-                       return getLabelUnread($link, $label_id, $owner_uid);
-
-               }
-
-               if ($match_part) {
-
-                       if ($n_feed != 0) {
-                               $from_qpart = "ttrss_user_entries,ttrss_feeds,ttrss_entries";
-                               $feeds_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
-                       } else {
-                               $from_qpart = "ttrss_user_entries,ttrss_entries";
-                               $feeds_qpart = '';
+                       if ($view_mode != "noscores") {
+                               $order_by = "score DESC, $order_by";
                        }
 
-                       $query = "SELECT count(int_id) AS unread
-                               FROM $from_qpart WHERE
-                               ttrss_user_entries.ref_id = ttrss_entries.id AND
-                               $age_qpart AND
-                               $feeds_qpart
-                               $unread_qpart AND ($match_part) AND ttrss_user_entries.owner_uid = $owner_uid";
-
-                       $result = db_query($link, $query);
-
-               } else {
-
-                       $result = db_query($link, "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 $age_qpart AND
-                                       ttrss_tags.owner_uid = " . $owner_uid);
-               }
-
-               $unread = db_fetch_result($result, 0, "unread");
-
-               return $unread;
-       }
+                       if ($override_order) {
+                               $order_by = $override_order;
+                       }
 
-       function getGlobalUnread($link, $user_id = false) {
-
-               if (!$user_id) {
-                       $user_id = $_SESSION["uid"];
-               }
-
-               $result = db_query($link, "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($link, $global_unread = -1) {
-               $ret_arr = array();
-
-               if ($global_unread == -1) {
-                       $global_unread = getGlobalUnread($link);
-               }
-
-               $cv = array("id" => "global-unread",
-                       "counter" => $global_unread);
-
-               array_push($ret_arr, $cv);
-
-               $result = db_query($link, "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" => $subscribed_feeds);
-
-               array_push($ret_arr, $cv);
-
-               return $ret_arr;
-       }
-
-       function getTagCounters($link) {
-
-               $ret_arr = array();
-
-               $age_qpart = getMaxAgeSubquery();
-
-               $result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id)
-                       FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
-                               AND ref_id = id AND $age_qpart
-                               AND unread = true)) AS count FROM ttrss_tags
-                               WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name
-                               ORDER BY count DESC LIMIT 55");
-
-               $tags = array();
-
-               while ($line = db_fetch_assoc($result)) {
-                       $tags[$line["tag_name"]] += $line["count"];
-               }
-
-               foreach (array_keys($tags) as $tag) {
-                       $unread = $tags[$tag];
-                       $tag = htmlspecialchars($tag);
-
-                       $cv = array("id" => $tag,
-                               "kind" => "tag",
-                               "counter" => $unread);
-
-                       array_push($ret_arr, $cv);
-               }
-
-               return $ret_arr;
-       }
-
-       function getVirtCounters($link) {
-
-               $ret_arr = array();
-
-               for ($i = 0; $i >= -4; $i--) {
-
-                       $count = getFeedUnread($link, $i);
-
-                       $cv = array("id" => $i,
-                               "counter" => $count);
-
-//                     if (get_pref($link, 'EXTENDED_FEEDLIST'))
-//                             $cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
-
-                       array_push($ret_arr, $cv);
-               }
-
-               return $ret_arr;
-       }
-
-       function getLabelCounters($link, $descriptions = false) {
-
-               $ret_arr = array();
-
-               $age_qpart = getMaxAgeSubquery();
-
-               $owner_uid = $_SESSION["uid"];
-
-               $result = db_query($link, "SELECT id, caption FROM ttrss_labels2
-                       WHERE owner_uid = '$owner_uid'");
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       $id = -$line["id"] - 11;
-
-                       $label_name = $line["caption"];
-                       $count = getFeedUnread($link, $id);
-
-                       $cv = array("id" => $id,
-                               "counter" => $count);
-
-                       if ($descriptions)
-                               $cv["description"] = $label_name;
-
-//                     if (get_pref($link, 'EXTENDED_FEEDLIST'))
-//                             $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
-
-                       array_push($ret_arr, $cv);
-               }
-
-               return $ret_arr;
-       }
-
-       function getFeedCounters($link, $active_feed = false) {
-
-               $ret_arr = array();
-
-               $age_qpart = getMaxAgeSubquery();
-
-               $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.feed_id = id";
-
-               $result = db_query($link, $query);
-               $fctrs_modified = false;
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       $id = $line["id"];
-                       $count = $line["count"];
-                       $last_error = htmlspecialchars($line["last_error"]);
-
-                       $last_updated = make_local_datetime($link, $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" => $count,
-                               "has_img" => (int) $has_img);
-
-                       if ($last_error)
-                               $cv["error"] = $last_error;
-
-//                     if (get_pref($link, 'EXTENDED_FEEDLIST'))
-//                             $cv["xmsg"] = getFeedArticles($link, $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($link) {
-               $result = db_query($link, "SELECT version() AS version");
-               $version = explode(" ", db_fetch_result($result, 0, "version"));
-               return $version[1];
-       }
-
-       /**
-        * Subscribes the user to the given feed
-        *
-        * @param resource $link       Database connection
-        * @param string   $url        Feed URL to subscribe to
-        * @param integer  $cat_id     Category ID the feed shall be added to
-        * @param string   $auth_login (optional) Feed username
-        * @param string   $auth_pass  (optional) Feed password
-        *
-        * @return integer Status code:
-        *                 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.
-        */
-       function subscribe_to_feed($link, $url, $cat_id = 0,
-                       $auth_login = '', $auth_pass = '') {
-
-               $url = fix_url($url);
-
-               if (!$url || !validate_feed_url($url)) return 2;
-
-               $update_method = 0;
-
-               $result = db_query($link, "SELECT twitter_oauth FROM ttrss_users
-                       WHERE id = ".$_SESSION['uid']);
-
-               $has_oauth = db_fetch_result($result, 0, 'twitter_oauth');
-
-               if (!$has_oauth || strpos($url, '://api.twitter.com') === false) {
-                       if (!fetch_file_contents($url, false, $auth_login, $auth_pass)) return 5;
-
-                       if (url_is_html($url, $auth_login, $auth_pass)) {
-                               $feedUrls = get_feeds_from_html($url, $auth_login, $auth_pass);
-                               if (count($feedUrls) == 0) {
-                                       return 3;
-                               } else if (count($feedUrls) > 1) {
-                                       return 4;
-                               }
-                               //use feed url as new URL
-                               $url = key($feedUrls);
-                       }
-
-                       } else {
-                               if (!fetch_twitter_rss($link, $url, $_SESSION['uid']))
-                                       return 5;
-
-                               $update_method = 3;
-                       }
-               if ($cat_id == "0" || !$cat_id) {
-                       $cat_qpart = "NULL";
-               } else {
-                       $cat_qpart = "'$cat_id'";
-               }
-
-               $result = db_query($link,
-                       "SELECT id FROM ttrss_feeds
-                       WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]);
-
-               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)
-                               VALUES ('".$_SESSION["uid"]."', '$url',
-                               '[Unknown]', $cat_qpart, '$auth_login', '$auth_pass', '$update_method')");
-
-                       $result = db_query($link,
-                               "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);
-                       }
-
-                       return 1;
-               } else {
-                       return 0;
-               }
-       }
-
-       function print_feed_select($link, $id, $default_id = "",
-               $attributes = "", $include_all_feeds = true) {
-
-               print "<select id=\"$id\" name=\"$id\" $attributes>";
-               if ($include_all_feeds) {
-                       print "<option value=\"0\">".__('All feeds')."</option>";
-               }
-
-               $result = db_query($link, "SELECT id,title FROM ttrss_feeds
-                       WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
-               if (db_num_rows($result) > 0 && $include_all_feeds) {
-                       print "<option disabled>--------</option>";
-               }
-
-               while ($line = db_fetch_assoc($result)) {
-                       if ($line["id"] == $default_id) {
-                               $is_selected = "selected=\"1\"";
-                       } else {
-                               $is_selected = "";
-                       }
-
-                       $title = truncate_string(htmlspecialchars($line["title"]), 40);
-
-                       printf("<option $is_selected value='%d'>%s</option>",
-                               $line["id"], $title);
-               }
-
-               print "</select>";
-       }
-
-       function print_feed_cat_select($link, $id, $default_id = "",
-               $attributes = "", $include_all_cats = true) {
-
-               print "<select id=\"$id\" name=\"$id\" default=\"$default_id\" onchange=\"catSelectOnChange(this)\" $attributes>";
-
-               if ($include_all_cats) {
-                       print "<option value=\"0\">".__('Uncategorized')."</option>";
-               }
-
-               $result = db_query($link, "SELECT id,title FROM ttrss_feed_categories
-                       WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
-               if (db_num_rows($result) > 0 && $include_all_cats) {
-                       print "<option disabled=\"1\">--------</option>";
-               }
-
-               while ($line = db_fetch_assoc($result)) {
-                       if ($line["id"] == $default_id) {
-                               $is_selected = "selected=\"1\"";
-                       } else {
-                               $is_selected = "";
-                       }
-
-                       if ($line["title"])
-                               printf("<option $is_selected value='%d'>%s</option>",
-                                       $line["id"], htmlspecialchars($line["title"]));
-               }
-
-#              print "<option value=\"ADD_CAT\">" .__("Add category...") . "</option>";
-
-               print "</select>";
-       }
-
-       function checkbox_to_sql_bool($val) {
-               return ($val == "on") ? "true" : "false";
-       }
-
-       function getFeedCatTitle($link, $id) {
-               if ($id == -1) {
-                       return __("Special");
-               } else if ($id < -10) {
-                       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
-                                       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/mark_set.png";
-                       break;
-               case -2:
-                       return "images/pub_set.png";
-                       break;
-               case -3:
-                       return "images/fresh.png";
-                       break;
-               case -4:
-                       return "images/tag.png";
-                       break;
-               default:
-                       if ($id < -10) {
-                               return "images/label.png";
-                       } else {
-                               if (file_exists(ICONS_DIR . "/$id.ico"))
-                                       return ICONS_URL . "/$id.ico";
-                       }
-                       break;
-               }
-       }
-
-       function getFeedTitle($link, $id) {
-               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 < -10) {
-                       $label_id = -$id - 11;
-                       $result = db_query($link, "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($link, "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;
-               }
-       }
-
-       function make_init_params($link) {
-               $params = array();
-
-               $params["theme"] = get_user_theme($link);
-               $params["theme_options"] = get_user_theme_options($link);
-
-               $params["sign_progress"] = theme_image($link, "images/indicator_white.gif");
-               $params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif");
-               $params["sign_excl"] = theme_image($link, "images/sign_excl.png");
-               $params["sign_info"] = theme_image($link, "images/sign_info.png");
-
-               foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
-                       "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
-                       "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT",
-                       "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
-
-                                $params[strtolower($param)] = (int) get_pref($link, $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["bw_limit"] = (int) $_SESSION["bw_limit"];
-
-               $result = db_query($link, "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");
-               $num_feeds = db_fetch_result($result, 0, "nf");
-
-               $params["max_feed_id"] = (int) $max_feed_id;
-               $params["num_feeds"] = (int) $num_feeds;
-
-               $params["collapsed_feedlist"] = (int) get_pref($link, "_COLLAPSED_FEEDLIST");
-
-               return $params;
-       }
-
-       function make_runtime_info($link) {
-               $data = array();
-
-               $result = db_query($link, "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");
-               $num_feeds = db_fetch_result($result, 0, "nf");
-
-               $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');
-
-               if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
-
-                       $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
-
-                       if (time() - $_SESSION["daemon_stamp_check"] > 30) {
-
-                               $stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
-
-                               if ($stamp) {
-                                       $stamp_delta = time() - $stamp;
-
-                                       if ($stamp_delta > 1800) {
-                                               $stamp_check = 0;
-                                       } else {
-                                               $stamp_check = 1;
-                                               $_SESSION["daemon_stamp_check"] = time();
-                                       }
-
-                                       $data['daemon_stamp_ok'] = $stamp_check;
-
-                                       $stamp_fmt = date("Y.m.d, G:i", $stamp);
-
-                                       $data['daemon_stamp'] = $stamp_fmt;
-                               }
-                       }
-               }
-
-               if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
-                               $new_version_details = @check_for_update($link);
-
-                               $data['new_version_available'] = (int) ($new_version_details != false);
-
-                               $_SESSION["last_version_check"] = time();
-               }
-
-               return $data;
-       }
-
-       function search_to_sql($link, $search, $match_on) {
-
-               $search_query_part = "";
-
-               $keywords = explode(" ", $search);
-               $query_keywords = array();
-
-               foreach ($keywords as $k) {
-                       if (strpos($k, "-") === 0) {
-                               $k = substr($k, 1);
-                               $not = "NOT";
-                       } else {
-                               $not = "";
-                       }
-
-                       $commandpair = explode(":", mb_strtolower($k), 2);
-
-                       if ($commandpair[0] == "note" && $commandpair[1]) {
-
-                               if ($commandpair[1] == "true")
-                                       array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-                               else
-                                       array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-
-                       } else if ($commandpair[0] == "star" && $commandpair[1]) {
-
-                               if ($commandpair[1] == "true")
-                                       array_push($query_keywords, "($not (marked = true))");
-                               else
-                                       array_push($query_keywords, "($not (marked = false))");
-
-                       } else if ($commandpair[0] == "pub" && $commandpair[1]) {
-
-                               if ($commandpair[1] == "true")
-                                       array_push($query_keywords, "($not (published = true))");
-                               else
-                                       array_push($query_keywords, "($not (published = false))");
-
-                       } else if (strpos($k, "@") === 0) {
-
-                               $user_tz_string = get_pref($link, 'USER_TIMEZONE', $_SESSION['uid']);
-                               $orig_ts = strtotime(substr($k, 1));
-                               $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
-
-                               //$k = date("Y-m-d", strtotime(substr($k, 1)));
-
-                               array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
-                       } else if ($match_on == "both") {
-                               array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
-                                               OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
-                       } else if ($match_on == "title") {
-                               array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%'))");
-                       } else if ($match_on == "content") {
-                               array_push($query_keywords, "(UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
-                       }
-               }
-
-               $search_query_part = implode("AND", $query_keywords);
-
-               return $search_query_part;
-       }
-
-
-       function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0) {
-
-               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-
-               $ext_tables_part = "";
-
-                       if ($search) {
-
-                               if (SPHINX_ENABLED) {
-                                       $ids = join(",", @sphinx_search($search, 0, 500));
-
-                                       if ($ids)
-                                               $search_query_part = "ref_id IN ($ids) AND ";
-                                       else
-                                               $search_query_part = "ref_id = -1 AND ";
-
-                               } else {
-                                       $search_query_part = search_to_sql($link, $search, $match_on);
-                                       $search_query_part .= " AND ";
-                               }
-
-                       } else {
-                               $search_query_part = "";
-                       }
-
-                       if ($filter) {
-                               $filter_query_part = filter_to_sql($filter);
-                       } else {
-                               $filter_query_part = "";
-                       }
-
-                       if ($since_id) {
-                               $since_id_part = "ttrss_entries.id > $since_id AND ";
-                       } else {
-                               $since_id_part = "";
-                       }
-
-                       $view_query_part = "";
-
-                       if ($view_mode == "adaptive" || $view_query_part == "noscores") {
-                               if ($search) {
-                                       $view_query_part = " ";
-                               } else if ($feed != -1) {
-                                       $unread = getFeedUnread($link, $feed, $cat_view);
-                                       if ($unread > 0) {
-                                               $view_query_part = " unread = true AND ";
-                                       }
-                               }
-                       }
-
-                       if ($view_mode == "marked") {
-                               $view_query_part = " marked = true AND ";
-                       }
-
-                       if ($view_mode == "published") {
-                               $view_query_part = " published = true AND ";
-                       }
-
-                       if ($view_mode == "unread") {
-                               $view_query_part = " unread = true AND ";
-                       }
-
-                       if ($view_mode == "updated") {
-                               $view_query_part = " (last_read is null and unread = false) AND ";
-                       }
-
-                       if ($limit > 0) {
-                               $limit_query_part = "LIMIT " . $limit;
-                       }
-
-                       $vfeed_query_part = "";
-
-                       // override query strategy and enable feed display when searching globally
-                       if ($search && $search_mode == "all_feeds") {
-                               $query_strategy_part = "ttrss_entries.id > 0";
-                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-                       /* tags */
-                       } else if (preg_match("/^-?[0-9][0-9]*$/", $feed) == false) {
-                               $query_strategy_part = "ttrss_entries.id > 0";
-                               $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
-                                       id = feed_id) as feed_title,";
-                       } else if ($feed > 0 && $search && $search_mode == "this_cat") {
-
-                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-
-                               $tmp_result = false;
-
-                               if ($cat_view) {
-                                       $tmp_result = db_query($link, "SELECT id
-                                               FROM ttrss_feeds WHERE cat_id = '$feed'");
-                               } else {
-                                       $tmp_result = db_query($link, "SELECT id
-                                               FROM ttrss_feeds WHERE cat_id = (SELECT cat_id FROM ttrss_feeds
-                                                       WHERE id = '$feed') AND id != '$feed'");
-                               }
-
-                               $cat_siblings = array();
-
-                               if (db_num_rows($tmp_result) > 0) {
-                                       while ($p = db_fetch_assoc($tmp_result)) {
-                                               array_push($cat_siblings, "feed_id = " . $p["id"]);
-                                       }
-
-                                       $query_strategy_part = sprintf("(feed_id = %d OR %s)",
-                                               $feed, implode(" OR ", $cat_siblings));
-
-                               } else {
-                                       $query_strategy_part = "ttrss_entries.id > 0";
-                               }
-
-                       } else if ($feed > 0) {
-
-                               if ($cat_view) {
-
-                                       if ($feed > 0) {
-                                               $query_strategy_part = "cat_id = '$feed'";
-                                       } else {
-                                               $query_strategy_part = "cat_id IS NULL";
-                                       }
-
-                                       $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-
-                               } else {
-                                       $query_strategy_part = "feed_id = '$feed'";
-                               }
-                       } else if ($feed == 0 && !$cat_view) { // archive virtual feed
-                               $query_strategy_part = "feed_id IS NULL";
-                       } else if ($feed == 0 && $cat_view) { // uncategorized
-                               $query_strategy_part = "cat_id IS NULL";
-                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-                       } else if ($feed == -1) { // starred virtual feed
-                               $query_strategy_part = "marked = true";
-                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-                       } else if ($feed == -2) { // published virtual feed OR labels category
-
-                               if (!$cat_view) {
-                                       $query_strategy_part = "published = true";
-                                       $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-                               } else {
-                                       $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-
-                                       $ext_tables_part = ",ttrss_labels2,ttrss_user_labels2";
-
-                                       $query_strategy_part = "ttrss_labels2.id = ttrss_user_labels2.label_id AND
-                                               ttrss_user_labels2.article_id = ref_id";
-
-                               }
-
-                       } 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);
-
-                               if (DB_TYPE == "pgsql") {
-                                       $query_strategy_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
-                               } else {
-                                       $query_strategy_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
-                               }
-
-                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-                       } else if ($feed == -4) { // all articles virtual feed
-                               $query_strategy_part = "true";
-                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-                       } else if ($feed <= -10) { // labels
-                               $label_id = -$feed - 11;
-
-                               $query_strategy_part = "label_id = '$label_id' AND
-                                       ttrss_labels2.id = ttrss_user_labels2.label_id AND
-                                       ttrss_user_labels2.article_id = ref_id";
-
-                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-                               $ext_tables_part = ",ttrss_labels2,ttrss_user_labels2";
-
-                       } else {
-                               $query_strategy_part = "id > 0"; // dumb
-                       }
-
-                       if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
-                               $date_sort_field = "updated";
-                       } else {
-                               $date_sort_field = "date_entered";
-                       }
-
-                       if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
-                               $order_by = "$date_sort_field";
-                       } else {
-                               $order_by = "$date_sort_field DESC";
-                       }
-
-                       if ($view_mode != "noscores") {
-                               $order_by = "score DESC, $order_by";
-                       }
-
-                       if ($override_order) {
-                               $order_by = $override_order;
-                       }
-
-                       $feed_title = "";
-
-                       if ($search) {
-                               $feed_title = "Search results";
-                       } else {
-                               if ($cat_view) {
-                                       $feed_title = getCategoryTitle($link, $feed);
-                               } else {
-                                       if (is_numeric($feed) && $feed > 0) {
-                                               $result = db_query($link, "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);
-                                       }
-                               }
-                       }
-
-                       $content_query_part = "content as content_preview,";
-
-                       if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
-
-                               if ($feed >= 0) {
-                                       $feed_kind = "Feeds";
-                               } else {
-                                       $feed_kind = "Labels";
-                               }
-
-                               if ($limit_query_part) {
-                                       $offset_query_part = "OFFSET $offset";
-                               }
-
-                               if ($vfeed_query_part && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
-                                       if (!$override_order) {
-                                               $order_by = "ttrss_feeds.title, $order_by";
-                                       }
-                               }
-
-                               if ($feed != "0") {
-                                       $from_qpart = "ttrss_entries,ttrss_user_entries,ttrss_feeds$ext_tables_part";
-                                       $feed_check_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
-
-                               } else {
-                                       $from_qpart = "ttrss_entries,ttrss_user_entries$ext_tables_part
-                                               LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
-                               }
-
-                               $query = "SELECT DISTINCT
-                                               date_entered,
-                                               guid,
-                                               ttrss_entries.id,ttrss_entries.title,
-                                               updated,
-                                               label_cache,
-                                               tag_cache,
-                                               always_display_enclosures,
-                                               site_url,
-                                               note,
-                                               num_comments,
-                                               comments,
-                                               int_id,
-                                               unread,feed_id,marked,published,link,last_read,orig_feed_id,
-                                               ".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
-                                               $vfeed_query_part
-                                               $content_query_part
-                                               ".SUBSTRING_FOR_DATE."(updated,1,19) as updated_noms,
-                                               author,score
-                                       FROM
-                                               $from_qpart
-                                       WHERE
-                                       $feed_check_qpart
-                                       ttrss_user_entries.ref_id = ttrss_entries.id AND
-                                       ttrss_user_entries.owner_uid = '$owner_uid' AND
-                                       $search_query_part
-                                       $filter_query_part
-                                       $view_query_part
-                                       $since_id_part
-                                       $query_strategy_part ORDER BY $order_by
-                                       $limit_query_part $offset_query_part";
-
-                               if ($_REQUEST["debug"]) print $query;
-
-                               $result = db_query($link, $query);
-
-                       } else {
-                               // browsing by tag
-
-                               $select_qpart = "SELECT DISTINCT " .
-                                                               "date_entered," .
-                                                               "guid," .
-                                                               "note," .
-                                                               "ttrss_entries.id as id," .
-                                                               "title," .
-                                                               "updated," .
-                                                               "unread," .
-                                                               "feed_id," .
-                                                               "orig_feed_id," .
-                                                               "site_url," .
-                                                               "always_display_enclosures, ".
-                                                               "marked," .
-                                                               "num_comments, " .
-                                                               "comments, " .
-                                                               "tag_cache," .
-                                                               "label_cache," .
-                                                               "link," .
-                                                               "last_read," .
-                                                               SUBSTRING_FOR_DATE . "(last_read,1,19) as last_read_noms," .
-                                                               $since_id_part .
-                                                               $vfeed_query_part .
-                                                               $content_query_part .
-                                                               SUBSTRING_FOR_DATE . "(updated,1,19) as updated_noms," .
-                                                               "score ";
-
-                               $feed_kind = "Tags";
-                               $all_tags = explode(",", $feed);
-                               if ($search_mode == 'any') {
-                                       $tag_sql = "tag_name in (" . implode(", ", array_map("db_quote", $all_tags)) . ")";
-                                       $from_qpart = " FROM ttrss_entries,ttrss_user_entries,ttrss_tags ";
-                                       $where_qpart = " WHERE " .
-                                                                  "ref_id = ttrss_entries.id AND " .
-                                                                  "ttrss_user_entries.owner_uid = $owner_uid AND " .
-                                                                  "post_int_id = int_id AND $tag_sql AND " .
-                                                                  $view_query_part .
-                                                                  $search_query_part .
-                                                                  $query_strategy_part . " ORDER BY $order_by " .
-                                                                  $limit_query_part;
-
-                               } else {
-                                       $i = 1;
-                                       $sub_selects = array();
-                                       $sub_ands = array();
-                                       foreach ($all_tags as $term) {
-                                               array_push($sub_selects, "(SELECT post_int_id from ttrss_tags WHERE tag_name = " . db_quote($term) . " AND owner_uid = $owner_uid) as A$i");
-                                               $i++;
-                                       }
-                                       if ($i > 2) {
-                                               $x = 1;
-                                               $y = 2;
-                                               do {
-                                                       array_push($sub_ands, "A$x.post_int_id = A$y.post_int_id");
-                                                       $x++;
-                                                       $y++;
-                                               } while ($y < $i);
-                                       }
-                                       array_push($sub_ands, "A1.post_int_id = ttrss_user_entries.int_id and ttrss_user_entries.owner_uid = $owner_uid");
-                                       array_push($sub_ands, "ttrss_user_entries.ref_id = ttrss_entries.id");
-                                       $from_qpart = " FROM " . implode(", ", $sub_selects) . ", ttrss_user_entries, ttrss_entries";
-                                       $where_qpart = " WHERE " . implode(" AND ", $sub_ands);
-                               }
-                               //                              error_log("TAG SQL: " . $tag_sql);
-                               // $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);
-                       }
-
-                       return array($result, $feed_title, $feed_site_url, $last_error);
-
-       }
-
-       function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat,
-               $limit, $search, $search_mode, $match_on, $view_mode = false) {
-
-               require_once "lib/MiniTemplator.class.php";
-
-               $note_style =   "background-color : #fff7d5;
-                       border-width : 1px; ".
-                       "padding : 5px; border-style : dashed; border-color : #e7d796;".
-                       "margin-bottom : 1em; color : #9a8c59;";
-
-               if (!$limit) $limit = 30;
-
-               if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
-                       $date_sort_field = "updated";
-               } else {
-                       $date_sort_field = "date_entered";
-               }
-
-               $qfh_ret = queryFeedHeadlines($link, $feed,
-                       $limit, $view_mode, $is_cat, $search, $search_mode,
-                       $match_on, "$date_sort_field DESC", 0, $owner_uid);
-
-               $result = $qfh_ret[0];
-               $feed_title = htmlspecialchars($qfh_ret[1]);
-               $feed_site_url = $qfh_ret[2];
-               $last_error = $qfh_ret[3];
-
-               $feed_self_url = get_self_url_prefix() .
-                       "/public.php?op=rss&id=-2&key=" .
-                       get_feed_access_key($link, -2, false);
-
-               if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
-
-               $tpl = new MiniTemplator;
-
-               $tpl->readTemplateFromFile("templates/generated_feed.txt");
-
-               $tpl->setVariable('FEED_TITLE', $feed_title);
-               $tpl->setVariable('VERSION', VERSION);
-               $tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url));
-
-               if (PUBSUBHUBBUB_HUB && $feed == -2) {
-                       $tpl->setVariable('HUB_URL', htmlspecialchars(PUBSUBHUBBUB_HUB));
-                       $tpl->addBlock('feed_hub');
-               }
-
-               $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()));
-
-               while ($line = db_fetch_assoc($result)) {
-                       $tpl->setVariable('ARTICLE_ID', htmlspecialchars($line['link']));
-                       $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']));
-                       $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']));
-                       $tpl->setVariable('ARTICLE_EXCERPT',
-                               truncate_string(strip_tags($line["content_preview"]), 100, '...'));
-
-                       $content = sanitize_rss($link, $line["content_preview"], false, $owner_uid);
-
-                       if ($line['note']) {
-                               $content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
-                                       $content;
-                       }
-
-                       $tpl->setVariable('ARTICLE_CONTENT', $content);
-
-                       $tpl->setVariable('ARTICLE_UPDATED', date('c', strtotime($line["updated"])));
-                       $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']));
-
-                       $tags = get_article_tags($link, $line["id"], $owner_uid);
-
-                       foreach ($tags as $tag) {
-                               $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag));
-                               $tpl->addBlock('category');
-                       }
-
-                       $enclosures = get_article_enclosures($link, $line["id"]);
-
-                       foreach ($enclosures as $e) {
-                               $type = htmlspecialchars($e['content_type']);
-                               $url = htmlspecialchars($e['content_url']);
-                               $length = $e['duration'];
-
-                               $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url);
-                               $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type);
-                               $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length);
-
-                               $tpl->addBlock('enclosure');
-                       }
-
-                       $tpl->addBlock('entry');
-               }
-
-               $tmp = "";
-
-               $tpl->addBlock('feed');
-               $tpl->generateOutputToString($tmp);
-
-               print $tmp;
-       }
-
-       function getCategoryTitle($link, $cat_id) {
-
-               if ($cat_id == -1) {
-                       return __("Special");
-               } else if ($cat_id == -2) {
-                       return __("Labels");
-               } else {
-
-                       $result = db_query($link, "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 sanitize_rss($link, $str, $force_strip_tags = false, $owner = false, $site_url = false) {
-               global $purifier;
-
-               if (!$owner) $owner = $_SESSION["uid"];
-
-               $res = trim($str); if (!$res) return '';
-
-               // create global Purifier object if needed
-               if (!$purifier) {
-                       require_once 'lib/htmlpurifier/library/HTMLPurifier.auto.php';
-
-                       $config = HTMLPurifier_Config::createDefault();
-
-                       $allowed = "p,a[href],i,em,b,strong,code,pre,blockquote,br,img[src|alt|title],ul,ol,li,h1,h2,h3,h4,s,object[classid|type|id|name|width|height|codebase],param[name|value],table,tr,td";
-
-                       $config->set('HTML.SafeObject', true);
-                       @$config->set('HTML', 'Allowed', $allowed);
-                       $config->set('Output.FlashCompat', true);
-                       $config->set('Attr.EnableID', true);
-                       if (!defined('MOBILE_VERSION')) {
-                               @$config->set('Cache', 'SerializerPath', CACHE_DIR . "/htmlpurifier");
-                       } else {
-                               @$config->set('Cache', 'SerializerPath', "../" . CACHE_DIR . "/htmlpurifier");
-                       }
-
-                       $purifier = new HTMLPurifier($config);
-               }
-
-               $res = $purifier->purify($res);
-
-               if (get_pref($link, "STRIP_IMAGES", $owner)) {
-                       $res = preg_replace('/<img[^>]+>/is', '', $res);
-               }
-
-               if (strpos($res, "href=") === false)
-                       $res = rewrite_urls($res);
-
-               $charset_hack = '<head>
-                       <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-               </head>';
-
-               $res = trim($res); if (!$res) return '';
-
-               libxml_use_internal_errors(true);
-
-               $doc = new DOMDocument();
-               $doc->loadHTML($charset_hack . $res);
-               $xpath = new DOMXPath($doc);
-
-               $entries = $xpath->query('(//a[@href]|//img[@src])');
-               $br_inserted = 0;
-
-               foreach ($entries as $entry) {
-
-                       if ($site_url) {
-
-                               if ($entry->hasAttribute('href'))
-                                       $entry->setAttribute('href',
-                                               rewrite_relative_url($site_url, $entry->getAttribute('href')));
-
-                               if ($entry->hasAttribute('src'))
-                                       if (preg_match('/^image.php\?i=[a-z0-9]+$/', $entry->getAttribute('src')) == 0)
-                                               $entry->setAttribute('src',
-                                                       rewrite_relative_url($site_url, $entry->getAttribute('src')));
-                       }
-
-                       if (strtolower($entry->nodeName) == "a") {
-                               $entry->setAttribute("target", "_blank");
-                       }
-
-                       if (strtolower($entry->nodeName) == "img" && !$br_inserted) {
-                               $br = $doc->createElement("br");
-
-                               if ($entry->parentNode->nextSibling) {
-                                       $entry->parentNode->insertBefore($br, $entry->nextSibling);
-                                       $br_inserted = 1;
-                               }
-
-                       }
-               }
-
-               $node = $doc->getElementsByTagName('body')->item(0);
-
-               return $doc->saveXML($node);
-       }
-
-       /**
-        * Send by mail a digest of last articles.
-        *
-        * @param mixed $link The database connection.
-        * @param integer $limit The maximum number of articles by digest.
-        * @return boolean Return false if digests are not enabled.
-        */
-       function send_headlines_digests($link, $limit = 100) {
-
-               require_once 'lib/phpmailer/class.phpmailer.php';
-
-               if (!DIGEST_ENABLE) return false;
-
-               $user_limit = DIGEST_EMAIL_LIMIT;
-               $days = 1;
-
-               print "Sending digests, batch of max $user_limit users, days = $days, headline limit = $limit\n\n";
-
-               if (DB_TYPE == "pgsql") {
-                       $interval_query = "last_digest_sent < NOW() - INTERVAL '$days days'";
-               } else if (DB_TYPE == "mysql") {
-                       $interval_query = "last_digest_sent < DATE_SUB(NOW(), INTERVAL $days DAY)";
-               }
-
-               $result = db_query($link, "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)) {
-                               print "Sending digest for UID:" . $line['id'] . " - " . $line["email"] . " ... ";
-
-                               $do_catchup = get_pref($link, 'DIGEST_CATCHUP', $line['id'], false);
-
-                               $tuple = prepare_headlines_digest($link, $line["id"], $days, $limit);
-                               $digest = $tuple[0];
-                               $headlines_count = $tuple[1];
-                               $affected_ids = $tuple[2];
-                               $digest_text = $tuple[3];
-
-                               if ($headlines_count > 0) {
-
-                                       $mail = new PHPMailer();
-
-                                       $mail->PluginDir = "lib/phpmailer/";
-                                       $mail->SetLanguage("en", "lib/phpmailer/language/");
-
-                                       $mail->CharSet = "UTF-8";
-
-                                       $mail->From = DIGEST_FROM_ADDRESS;
-                                       $mail->FromName = DIGEST_FROM_NAME;
-                                       $mail->AddAddress($line["email"], $line["login"]);
-
-                                       if (DIGEST_SMTP_HOST) {
-                                               $mail->Host = DIGEST_SMTP_HOST;
-                                               $mail->Mailer = "smtp";
-                                               $mail->SMTPAuth = DIGEST_SMTP_LOGIN != '';
-                                               $mail->Username = DIGEST_SMTP_LOGIN;
-                                               $mail->Password = DIGEST_SMTP_PASSWORD;
-                                       }
-
-                                       $mail->IsHTML(true);
-                                       $mail->Subject = DIGEST_SUBJECT;
-                                       $mail->Body = $digest;
-                                       $mail->AltBody = $digest_text;
-
-                                       $rc = $mail->Send();
-
-                                       if (!$rc) print "ERROR: " . $mail->ErrorInfo;
-
-                                       print "RC=$rc\n";
-
-                                       if ($rc && $do_catchup) {
-                                               print "Marking affected articles as read...\n";
-                                               catchupArticlesById($link, $affected_ids, 0, $line["id"]);
-                                       }
-                               } else {
-                                       print "No headlines\n";
-                               }
-
-                               db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW()
-                                       WHERE id = " . $line["id"]);
-                       }
-               }
-
-               print "All done.\n";
-
-       }
-
-       function prepare_headlines_digest($link, $user_id, $days = 1, $limit = 100) {
-
-               require_once "lib/MiniTemplator.class.php";
-
-               $tpl = new MiniTemplator;
-               $tpl_t = new MiniTemplator;
-
-               $tpl->readTemplateFromFile("templates/digest_template_html.txt");
-               $tpl_t->readTemplateFromFile("templates/digest_template.txt");
-
-               $tpl->setVariable('CUR_DATE', date('Y/m/d'));
-               $tpl->setVariable('CUR_TIME', date('G:i'));
-
-               $tpl_t->setVariable('CUR_DATE', date('Y/m/d'));
-               $tpl_t->setVariable('CUR_TIME', date('G:i'));
-
-               $affected_ids = array();
-
-               if (DB_TYPE == "pgsql") {
-                       $interval_query = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
-               } else if (DB_TYPE == "mysql") {
-                       $interval_query = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
-               }
-
-               $result = db_query($link, "SELECT ttrss_entries.title,
-                               ttrss_feeds.title AS feed_title,
-                               date_updated,
-                               ttrss_user_entries.ref_id,
-                               link,
-                               SUBSTRING(content, 1, 120) AS excerpt,
-                               ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
-                       FROM
-                               ttrss_user_entries,ttrss_entries,ttrss_feeds
-                       WHERE
-                               ref_id = ttrss_entries.id AND feed_id = ttrss_feeds.id
-                               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_updated DESC
-                       LIMIT $limit");
-
-               $cur_feed_title = "";
-
-               $headlines_count = db_num_rows($result);
-
-               $headlines = array();
-
-               while ($line = db_fetch_assoc($result)) {
-                       array_push($headlines, $line);
-               }
-
-               for ($i = 0; $i < sizeof($headlines); $i++) {
-
-                       $line = $headlines[$i];
-
-                       array_push($affected_ids, $line["ref_id"]);
-
-                       $updated = make_local_datetime($link, $line['last_updated'], false,
-                               $user_id);
-
-                       $tpl->setVariable('FEED_TITLE', $line["feed_title"]);
-                       $tpl->setVariable('ARTICLE_TITLE', $line["title"]);
-                       $tpl->setVariable('ARTICLE_LINK', $line["link"]);
-                       $tpl->setVariable('ARTICLE_UPDATED', $updated);
-                       $tpl->setVariable('ARTICLE_EXCERPT',
-                               truncate_string(strip_tags($line["excerpt"]), 100));
-
-                       $tpl->addBlock('article');
-
-                       $tpl_t->setVariable('FEED_TITLE', $line["feed_title"]);
-                       $tpl_t->setVariable('ARTICLE_TITLE', $line["title"]);
-                       $tpl_t->setVariable('ARTICLE_LINK', $line["link"]);
-                       $tpl_t->setVariable('ARTICLE_UPDATED', $updated);
-//                     $tpl_t->setVariable('ARTICLE_EXCERPT',
-//                             truncate_string(strip_tags($line["excerpt"]), 100));
-
-                       $tpl_t->addBlock('article');
-
-                       if ($headlines[$i]['feed_title'] != $headlines[$i+1]['feed_title']) {
-                               $tpl->addBlock('feed');
-                               $tpl_t->addBlock('feed');
-                       }
-
-               }
-
-               $tpl->addBlock('digest');
-               $tpl->generateOutputToString($tmp);
-
-               $tpl_t->addBlock('digest');
-               $tpl_t->generateOutputToString($tmp_t);
-
-               return array($tmp, $headlines_count, $affected_ids, $tmp_t);
-       }
-
-       function check_for_update($link) {
-               if (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) {
-                       $version_url = "http://tt-rss.org/version.php?ver=" . VERSION;
-
-                       $version_data = @fetch_file_contents($version_url);
-
-                       if ($version_data) {
-                               $version_data = json_decode($version_data, true);
-                               if ($version_data && $version_data['version']) {
-
-                                       if (version_compare(VERSION, $version_data['version']) == -1) {
-                                               return $version_data;
-                                       }
-                               }
-                       }
-               }
-               return false;
-       }
-
-       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 publishArticlesById($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
-                       published = false,last_read = NOW()
-                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
-               } else if ($cmode == 1) {
-                       db_query($link, "UPDATE ttrss_user_entries SET
-                       published = true
-                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
-               } else {
-                       db_query($link, "UPDATE ttrss_user_entries SET
-                       published = NOT published,last_read = NOW()
-                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
-               }
-
-               if (PUBSUBHUBBUB_HUB) {
-                       $rss_link = get_self_url_prefix() .
-                               "/public.php?op=rss&id=-2&key=" .
-                               get_feed_access_key($link, -2, false);
-
-                       $p = new Publisher(PUBSUBHUBBUB_HUB);
-
-                       $pubsub_result = $p->publish_update($rss_link);
-               }
-       }
-
-       function catchupArticlesById($link, $ids, $cmode, $owner_uid = false) {
-
-               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-               if (count($ids) == 0) return;
-
-               $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 = $owner_uid");
-               } else if ($cmode == 1) {
-                       db_query($link, "UPDATE ttrss_user_entries SET
-                       unread = true
-                       WHERE ($ids_qpart) AND owner_uid = $owner_uid");
-               } else {
-                       db_query($link, "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
-                       WHERE ($ids_qpart) AND owner_uid = $owner_uid");
-
-               while ($line = db_fetch_assoc($result)) {
-                       ccache_update($link, $line["feed_id"], $owner_uid);
-               }
-       }
-
-       function catchupArticleById($link, $id, $cmode) {
-
-               if ($cmode == 0) {
-                       db_query($link, "UPDATE ttrss_user_entries SET
-                       unread = false,last_read = NOW()
-                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-               } else if ($cmode == 1) {
-                       db_query($link, "UPDATE ttrss_user_entries SET
-                       unread = true
-                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-               } else {
-                       db_query($link, "UPDATE ttrss_user_entries SET
-                       unread = NOT unread,last_read = NOW()
-                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-               }
-
-               $feed_id = getArticleFeed($link, $id);
-               ccache_update($link, $feed_id, $_SESSION["uid"]);
-       }
-
-       function make_guid_from_title($title) {
-               return preg_replace("/[ \"\',.:;]/", "-",
-                       mb_strtolower(strip_tags($title), 'utf-8'));
-       }
-
-       function format_headline_subtoolbar($link, $feed_site_url, $feed_title,
-                       $feed_id, $is_cat, $search, $match_on,
-                       $search_mode, $view_mode, $error) {
-
-               $page_prev_link = "viewFeedGoPage(-1)";
-               $page_next_link = "viewFeedGoPage(1)";
-               $page_first_link = "viewFeedGoPage(0)";
-
-               $catchup_page_link = "catchupPage()";
-               $catchup_feed_link = "catchupCurrentFeed()";
-               $catchup_sel_link = "catchupSelection()";
-
-               $archive_sel_link = "archiveSelection()";
-               $delete_sel_link = "deleteSelection()";
-
-               $sel_all_link = "selectArticles('all')";
-               $sel_unread_link = "selectArticles('unread')";
-               $sel_none_link = "selectArticles('none')";
-               $sel_inv_link = "selectArticles('invert')";
-
-               $tog_unread_link = "selectionToggleUnread()";
-               $tog_marked_link = "selectionToggleMarked()";
-               $tog_published_link = "selectionTogglePublished()";
-
-               $reply = "<div id=\"subtoolbar_main\">";
-
-               $reply .= __('Select:')."
-                       <a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,
-                       <a href=\"#\" onclick=\"$sel_unread_link\">".__('Unread')."</a>,
-                       <a href=\"#\" onclick=\"$sel_inv_link\">".__('Invert')."</a>,
-                       <a href=\"#\" onclick=\"$sel_none_link\">".__('None')."</a></li>";
-
-               $reply .= " ";
-
-               $reply .= "<select dojoType=\"dijit.form.Select\"
-                       onchange=\"headlineActionsChange(this)\">";
-               $reply .= "<option value=\"false\">".__('Actions...')."</option>";
-
-               $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>";
-
-               $reply .= "<option value=\"$tog_unread_link\">".__('Unread')."</option>
-                       <option value=\"$tog_marked_link\">".__('Starred')."</option>
-                       <option value=\"$tog_published_link\">".__('Published')."</option>";
-
-               $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";
-
-               $reply .= "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>";
-
-               if ($feed_id != "0") {
-                       $reply .= "<option value=\"$archive_sel_link\">".__('Archive')."</option>";
-               } else {
-                       $reply .= "<option value=\"$archive_sel_link\">".__('Move back')."</option>";
-                       $reply .= "<option value=\"$delete_sel_link\">".__('Delete')."</option>";
-
-               }
-
-               $reply .= "<option value=\"emailArticle(false)\">".__('Forward by email').
-                       "</option>";
-
-               if ($is_cat) $cat_q = "&is_cat=$is_cat";
-
-               if ($search) {
-                       $search_q = "&q=$search&m=$match_on&smode=$search_mode";
-               } else {
-                       $search_q = "";
-               }
-
-               $rss_link = htmlspecialchars(get_self_url_prefix() .
-                       "/public.php?op=rss&id=$feed_id$cat_q$search_q");
-
-               $reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
-
-               $reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
-
-               $reply .= "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>";
-
-               $reply .= "</select>";
-
-               $reply .= "</div>";
-
-               $reply .= "<div id=\"subtoolbar_ftitle\">";
-
-               if ($feed_site_url) {
-                       $target = "target=\"_blank\"";
-                       $reply .= "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
-                               truncate_string($feed_title,30)."</a>";
-
-                       if ($error) {
-                               $reply .= " (<span class=\"error\" title=\"$error\">Error</span>)";
-                       }
-
-               } else {
-                       if ($feed_id < -10) {
-                               $label_id = -11-$feed_id;
-
-                               $result = db_query($link, "SELECT fg_color, bg_color
-                                       FROM ttrss_labels2 WHERE id = '$label_id' AND owner_uid = " .
-                                       $_SESSION["uid"]);
-
-                               if (db_num_rows($result) != 0) {
-                                       $fg_color = db_fetch_result($result, 0, "fg_color");
-                                       $bg_color = db_fetch_result($result, 0, "bg_color");
-
-                                       $reply .= "<span style=\"background : $bg_color; color : $fg_color\" >";
-                                       $reply .= $feed_title;
-                                       $reply .= "</span>";
-                               } else {
-                                       $reply .= $feed_title;
-                               }
-
-                       } else {
-                               $reply .= $feed_title;
-                       }
-               }
-
-               $reply .= "
-                       <a href=\"#\"
-                               title=\"".__("View as RSS feed")."\"
-                               onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">
-                               <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/feed-icon-12x12.png\"></a>";
-
-               $reply .= "</div>";
-
-               return $reply;
-       }
-
-       function outputFeedList($link, $special = true) {
-
-               $feedlist = array();
-
-               $enable_cats = get_pref($link, 'ENABLE_FEED_CATS');
-
-               $feedlist['identifier'] = 'id';
-               $feedlist['label'] = 'name';
-               $feedlist['items'] = array();
-
-               $owner_uid = $_SESSION["uid"];
-
-               /* virtual feeds */
-
-               if ($special) {
-
-                       if ($enable_cats) {
-                               $cat_hidden = get_pref($link, "_COLLAPSED_SPECIAL");
-                               $cat = feedlist_init_cat($link, -1, $cat_hidden);
-                       } else {
-                               $cat['items'] = array();
-                       }
-
-                       foreach (array(-4, -3, -1, -2, 0) as $i) {
-                               array_push($cat['items'], feedlist_init_feed($link, $i));
-                       }
-
-                       if ($enable_cats) {
-                               array_push($feedlist['items'], $cat);
-                       } else {
-                               $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
-                       }
-
-                       $result = db_query($link, "SELECT * FROM
-                               ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");
-
-                       if (db_num_rows($result) > 0) {
-
-                               if (get_pref($link, 'ENABLE_FEED_CATS')) {
-                                       $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
-                                       $cat = feedlist_init_cat($link, -2, $cat_hidden);
-                               } else {
-                                       $cat['items'] = array();
-                               }
-
-                               while ($line = db_fetch_assoc($result)) {
-
-                                       $label_id = -$line['id'] - 11;
-                                       $count = getFeedUnread($link, $label_id);
-
-                                       $feed = feedlist_init_feed($link, $label_id, false, $count);
-
-                                       $feed['fg_color'] = $line['fg_color'];
-                                       $feed['bg_color'] = $line['bg_color'];
-
-                                       array_push($cat['items'], $feed);
-                               }
-
-                               if ($enable_cats) {
-                                       array_push($feedlist['items'], $cat);
-                               } else {
-                                       $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
-                               }
-                       }
-               }
-
-/*             if (get_pref($link, 'ENABLE_FEED_CATS')) {
-                       if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
-                               $order_by_qpart = "order_id,category,unread DESC,title";
-                       } else {
-                               $order_by_qpart = "order_id,category,title";
-                       }
-               } else {
-                       if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
-                               $order_by_qpart = "unread DESC,title";
-                       } else {
-                               $order_by_qpart = "title";
-                       }
-               } */
-
-               /* real feeds */
-
-               if ($enable_cats)
-                       $order_by_qpart = "ttrss_feed_categories.order_id,category,
-                               ttrss_feeds.order_id,title";
-               else
-                       $order_by_qpart = "title";
-
-               $age_qpart = getMaxAgeSubquery();
-
-               $query = "SELECT ttrss_feeds.id, ttrss_feeds.title,
-                       ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,
-                       cat_id,last_error,
-                       ttrss_feed_categories.title AS category,
-                       ttrss_feed_categories.collapsed,
-                       value AS unread
-                       FROM ttrss_feeds LEFT JOIN ttrss_feed_categories
-                               ON (ttrss_feed_categories.id = cat_id)
-                       LEFT JOIN ttrss_counters_cache
-                               ON
-                                       (ttrss_feeds.id = feed_id)
-                       WHERE
-                               ttrss_feeds.owner_uid = '$owner_uid'
-                       ORDER BY $order_by_qpart";
-
-               $result = db_query($link, $query);
-
-               $actid = $_REQUEST["actid"];
-
-               if (db_num_rows($result) > 0) {
-
-                       $category = "";
-
-                       if (!$enable_cats)
-                               $cat['items'] = array();
-                       else
-                               $cat = false;
-
-                       while ($line = db_fetch_assoc($result)) {
-
-                               $feed = htmlspecialchars(trim($line["title"]));
-
-                               if (!$feed) $feed = "[Untitled]";
-
-                               $feed_id = $line["id"];
-                               $unread = $line["unread"];
-
-                               $cat_id = $line["cat_id"];
-                               $tmp_category = $line["category"];
-                               if (!$tmp_category) $tmp_category = __("Uncategorized");
-
-                               if ($category != $tmp_category && $enable_cats) {
-
-                                       $category = $tmp_category;
-
-                                       $collapsed = sql_bool_to_bool($line["collapsed"]);
-
-                                       // workaround for NULL category
-                                       if ($category == __("Uncategorized")) {
-                                               $collapsed = get_pref($link, "_COLLAPSED_UNCAT");
-                                       }
-
-                                       if ($cat) array_push($feedlist['items'], $cat);
-
-                                       $cat = feedlist_init_cat($link, $cat_id, $collapsed);
-                               }
-
-                               $updated = make_local_datetime($link, $line["updated_noms"], false);
-
-                               array_push($cat['items'], feedlist_init_feed($link, $feed_id,
-                                       $feed, $unread, $line['last_error'], $updated));
-                       }
-
-                       if ($enable_cats) {
-                               array_push($feedlist['items'], $cat);
-                       } else {
-                               $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
-                       }
-
-               }
-
-               return $feedlist;
-       }
-
-       function get_article_tags($link, $id, $owner_uid = 0, $tag_cache = false) {
-
-               global $memcache;
-
-               $a_id = db_escape_string($id);
-
-               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-
-               $query = "SELECT DISTINCT tag_name,
-                       owner_uid as owner FROM
-                       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();
-
-               if ($memcache && $obj = $memcache->get($obj_id)) {
-                       $tags = $obj;
-               } else {
-                       /* check cache first */
-
-                       if ($tag_cache === false) {
-                               $result = db_query($link, "SELECT tag_cache FROM ttrss_user_entries
-                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-
-                               $tag_cache = db_fetch_result($result, 0, "tag_cache");
-                       }
-
-                       if ($tag_cache) {
-                               $tags = explode(",", $tag_cache);
-                       } else {
-
-                               /* do it the hard way */
-
-                               $tmp_result = db_query($link, $query);
-
-                               while ($tmp_line = db_fetch_assoc($tmp_result)) {
-                                       array_push($tags, $tmp_line["tag_name"]);
-                               }
-
-                               /* update the cache */
-
-                               $tags_str = db_escape_string(join(",", $tags));
-
-                               db_query($link, "UPDATE ttrss_user_entries
-                                       SET tag_cache = '$tags_str' WHERE ref_id = '$id'
-                                       AND owner_uid = " . $_SESSION["uid"]);
-                       }
-
-                       if ($memcache) $memcache->add($obj_id, $tags, 0, 3600);
-               }
-
-               return $tags;
-       }
-
-       function trim_array($array) {
-               $tmp = $array;
-               array_walk($tmp, 'trim');
-               return $tmp;
-       }
-
-       function tag_is_valid($tag) {
-               if ($tag == '') return false;
-               if (preg_match("/^[0-9]*$/", $tag)) return false;
-               if (mb_strlen($tag) > 250) return false;
-
-               if (function_exists('iconv')) {
-                       $tag = iconv("utf-8", "utf-8", $tag);
-               }
-
-               if (!$tag) return false;
-
-               return true;
-       }
-
-       function render_login_form($link, $mobile = 0) {
-               switch ($mobile) {
-               case 0:
-                       require_once "login_form.php";
-                       break;
-               case 1:
-                       require_once "mobile/login_form.php";
-                       break;
-               case 2:
-                       require_once "mobile/classic/login_form.php";
-               }
-       }
-
-       // 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\">
-                       <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
-       }
-
-       function format_notice($msg, $id = "") {
-               global $link;
-               return "<div class=\"notice\" id=\"$id\">
-                       <img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>";
-       }
-
-       function format_error($msg, $id = "") {
-               global $link;
-               return "<div class=\"error\" id=\"$id\">
-                       <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
-       }
-
-       function print_notice($msg) {
-               return print format_notice($msg);
-       }
-
-       function print_warning($msg) {
-               return print format_warning($msg);
-       }
-
-       function print_error($msg) {
-               return print format_error($msg);
-       }
-
-
-       function T_sprintf() {
-               $args = func_get_args();
-               return vsprintf(__(array_shift($args)), $args);
-       }
-
-       function format_inline_player($link, $url, $ctype) {
-
-               $entry = "";
-
-               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 )) {
-
-                               $id = 'AUDIO-' . uniqid();
-
-                               $entry .= "<audio id=\"$id\"\">
-                                       <source src=\"$url\"></source>
-                                       </audio>";
-
-                               $entry .= "<span onclick=\"player(this)\"
-                                       title=\"".__("Click to play")."\" status=\"0\"
-                                       class=\"player\" audio-id=\"$id\">".__("Play")."</span>";
+                       $feed_title = "";
 
+                       if ($search) {
+                               $feed_title = "Search results";
                        } else {
+                               if ($cat_view) {
+                                       $feed_title = getCategoryTitle($link, $feed);
+                               } else {
+                                       if (is_numeric($feed) && $feed > 0) {
+                                               $result = db_query($link, "SELECT title,site_url,last_error
+                                                       FROM ttrss_feeds WHERE id = '$feed' AND owner_uid = $owner_uid");
 
-                               $entry .= "<object type=\"application/x-shockwave-flash\"
-                                       data=\"lib/button/musicplayer.swf?song_url=$url\"
-                                       width=\"17\" height=\"17\" style='float : left; margin-right : 5px;'>
-                                       <param name=\"movie\"
-                                               value=\"lib/button/musicplayer.swf?song_url=$url\" />
-                                       </object>";
-                       }
-               }
-
-               $filename = substr($url, strrpos($url, "/")+1);
-
-               $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
-                       $filename . " (" . $ctype . ")" . "</a>";
-
-               return $entry;
-       }
-
-       function format_article($link, $id, $mark_as_read = true, $zoom_mode = false) {
-
-               $rv = array();
-
-               $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 :( */
-
-               $result = db_query($link, "SELECT feed_id FROM ttrss_user_entries
-                       WHERE ref_id = '$id'");
-
-               $feed_id = (int) db_fetch_result($result, 0, "feed_id");
-
-               $rv['feed_id'] = $feed_id;
-
-               //if (!$zoom_mode) { print "<article id='$id'><![CDATA["; };
-
-               $result = db_query($link, "SELECT rtl_content, always_display_enclosures FROM ttrss_feeds
-                       WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
-
-               if (db_num_rows($result) == 1) {
-                       $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
-                       $always_display_enclosures = sql_bool_to_bool(db_fetch_result($result, 0, "always_display_enclosures"));
-               } else {
-                       $rtl_content = false;
-                       $always_display_enclosures = false;
-               }
-
-               if ($rtl_content) {
-                       $rtl_tag = "dir=\"RTL\"";
-                       $rtl_class = "RTL";
-               } else {
-                       $rtl_tag = "";
-                       $rtl_class = "";
-               }
-
-               if ($mark_as_read) {
-                       $result = db_query($link, "UPDATE ttrss_user_entries
-                               SET unread = false,last_read = NOW()
-                               WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-
-                       ccache_update($link, $feed_id, $_SESSION["uid"]);
-               }
-
-               $result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
-                       ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
-                       (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
-                       (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
-                       num_comments,
-                       tag_cache,
-                       author,
-                       orig_feed_id,
-                       note
-                       FROM ttrss_entries,ttrss_user_entries
-                       WHERE   id = '$id' AND ref_id = id AND owner_uid = " . $_SESSION["uid"]);
-
-               if ($result) {
-
-                       $line = db_fetch_assoc($result);
-
-                       if ($line["icon_url"]) {
-                               $feed_icon = "<img src=\"" . $line["icon_url"] . "\">";
-                       } else {
-                               $feed_icon = "&nbsp;";
+                                               $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_site_url = $line['site_url'];
+                       $content_query_part = "content as content_preview,";
 
-                       $num_comments = $line["num_comments"];
-                       $entry_comments = "";
+                       if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
 
-                       if ($num_comments > 0) {
-                               if ($line["comments"]) {
-                                       $comments_url = $line["comments"];
+                               if ($feed >= 0) {
+                                       $feed_kind = "Feeds";
                                } else {
-                                       $comments_url = $line["link"];
-                               }
-                               $entry_comments = "<a target='_blank' href=\"$comments_url\">$num_comments comments</a>";
-                       } else {
-                               if ($line["comments"] && $line["link"] != $line["comments"]) {
-                                       $entry_comments = "<a target='_blank' href=\"".$line["comments"]."\">comments</a>";
+                                       $feed_kind = "Labels";
                                }
-                       }
 
-                       if ($zoom_mode) {
-                               header("Content-Type: text/html");
-                               $rv['content'] .= "<html><head>
-                                               <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-                                               <title>Tiny Tiny RSS - ".$line["title"]."</title>
-                                               <link rel=\"stylesheet\" type=\"text/css\" href=\"tt-rss.css\">
-                                       </head><body>";
-                       }
-
-                       $rv['content'] .= "<div id=\"PTITLE-$id\" style=\"display : none\">" .
-                               truncate_string(strip_tags($line['title']), 15) . "</div>";
+                               if ($limit_query_part) {
+                                       $offset_query_part = "OFFSET $offset";
+                               }
 
-                       $rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">";
+                               if ($vfeed_query_part && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
+                                       if (!$override_order) {
+                                               $order_by = "ttrss_feeds.title, $order_by";
+                                       }
+                               }
 
-                       $rv['content'] .= "<div onclick=\"return postClicked(event, $id)\"
-                               class=\"postHeader\" id=\"POSTHDR-$id\">";
+                               if ($feed != "0") {
+                                       $from_qpart = "ttrss_entries,ttrss_user_entries,ttrss_feeds$ext_tables_part";
+                                       $feed_check_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
 
-                       $entry_author = $line["author"];
+                               } else {
+                                       $from_qpart = "ttrss_entries,ttrss_user_entries$ext_tables_part
+                                               LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
+                               }
 
-                       if ($entry_author) {
-                               $entry_author = __(" - ") . $entry_author;
-                       }
+                               $query = "SELECT DISTINCT
+                                               date_entered,
+                                               guid,
+                                               ttrss_entries.id,ttrss_entries.title,
+                                               updated,
+                                               label_cache,
+                                               tag_cache,
+                                               always_display_enclosures,
+                                               site_url,
+                                               note,
+                                               num_comments,
+                                               comments,
+                                               int_id,
+                                               unread,feed_id,marked,published,link,last_read,orig_feed_id,
+                                               ".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
+                                               $vfeed_query_part
+                                               $content_query_part
+                                               ".SUBSTRING_FOR_DATE."(updated,1,19) as updated_noms,
+                                               author,score
+                                       FROM
+                                               $from_qpart
+                                       WHERE
+                                       $feed_check_qpart
+                                       ttrss_user_entries.ref_id = ttrss_entries.id AND
+                                       ttrss_user_entries.owner_uid = '$owner_uid' AND
+                                       $search_query_part
+                                       $filter_query_part
+                                       $view_query_part
+                                       $since_id_part
+                                       $query_strategy_part ORDER BY $order_by
+                                       $limit_query_part $offset_query_part";
 
-                       $parsed_updated = make_local_datetime($link, $line["updated"], true,
-                               false, true);
+                               if ($_REQUEST["debug"]) print $query;
 
-                       $rv['content'] .= "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
+                               $result = db_query($link, $query);
 
-                       if ($line["link"]) {
-                               $rv['content'] .= "<div clear='both'><a target='_blank'
-                                       title=\"".htmlspecialchars($line['title'])."\"
-                                       href=\"" .
-                                       $line["link"] . "\">" .
-                                       truncate_string($line["title"], 100) .
-                                       "<span class='author'>$entry_author</span></a></div>";
                        } else {
-                               $rv['content'] .= "<div clear='both'>" . $line["title"] . "$entry_author</div>";
-                       }
+                               // browsing by tag
 
-                       $tag_cache = $line["tag_cache"];
+                               $select_qpart = "SELECT DISTINCT " .
+                                                               "date_entered," .
+                                                               "guid," .
+                                                               "note," .
+                                                               "ttrss_entries.id as id," .
+                                                               "title," .
+                                                               "updated," .
+                                                               "unread," .
+                                                               "feed_id," .
+                                                               "orig_feed_id," .
+                                                               "marked," .
+                                                               "num_comments, " .
+                                                               "comments, " .
+                                                               "tag_cache," .
+                                                               "label_cache," .
+                                                               "link," .
+                                                               "last_read," .
+                                                               SUBSTRING_FOR_DATE . "(last_read,1,19) as last_read_noms," .
+                                                               $since_id_part .
+                                                               $vfeed_query_part .
+                                                               $content_query_part .
+                                                               SUBSTRING_FOR_DATE . "(updated,1,19) as updated_noms," .
+                                                               "score ";
 
-                       if (!$tag_cache)
-                               $tags = get_article_tags($link, $id);
-                       else
-                               $tags = explode(",", $tag_cache);
+                               $feed_kind = "Tags";
+                               $all_tags = explode(",", $feed);
+                               if ($search_mode == 'any') {
+                                       $tag_sql = "tag_name in (" . implode(", ", array_map("db_quote", $all_tags)) . ")";
+                                       $from_qpart = " FROM ttrss_entries,ttrss_user_entries,ttrss_tags ";
+                                       $where_qpart = " WHERE " .
+                                                                  "ref_id = ttrss_entries.id AND " .
+                                                                  "ttrss_user_entries.owner_uid = $owner_uid AND " .
+                                                                  "post_int_id = int_id AND $tag_sql AND " .
+                                                                  $view_query_part .
+                                                                  $search_query_part .
+                                                                  $query_strategy_part . " ORDER BY $order_by " .
+                                                                  $limit_query_part;
 
-                       $tags_str = format_tags_string($tags, $id);
-                       $tags_str_full = join(", ", $tags);
+                               } else {
+                                       $i = 1;
+                                       $sub_selects = array();
+                                       $sub_ands = array();
+                                       foreach ($all_tags as $term) {
+                                               array_push($sub_selects, "(SELECT post_int_id from ttrss_tags WHERE tag_name = " . db_quote($term) . " AND owner_uid = $owner_uid) as A$i");
+                                               $i++;
+                                       }
+                                       if ($i > 2) {
+                                               $x = 1;
+                                               $y = 2;
+                                               do {
+                                                       array_push($sub_ands, "A$x.post_int_id = A$y.post_int_id");
+                                                       $x++;
+                                                       $y++;
+                                               } while ($y < $i);
+                                       }
+                                       array_push($sub_ands, "A1.post_int_id = ttrss_user_entries.int_id and ttrss_user_entries.owner_uid = $owner_uid");
+                                       array_push($sub_ands, "ttrss_user_entries.ref_id = ttrss_entries.id");
+                                       $from_qpart = " FROM " . implode(", ", $sub_selects) . ", ttrss_user_entries, ttrss_entries";
+                                       $where_qpart = " WHERE " . implode(" AND ", $sub_ands);
+                               }
+                               //                              error_log("TAG SQL: " . $tag_sql);
+                               // $tag_sql = "tag_name = '$feed'";   DEFAULT way
 
-                       if (!$tags_str_full) $tags_str_full = __("no tags");
+                               //                              error_log("[". $select_qpart . "][" . $from_qpart . "][" .$where_qpart . "]");
+                               $result = db_query($link, $select_qpart . $from_qpart . $where_qpart);
+                       }
 
-                       if (!$entry_comments) $entry_comments = "&nbsp;"; # placeholder
+                       return array($result, $feed_title, $feed_site_url, $last_error);
 
-                       $rv['content'] .= "<div style='float : right'>
-                               <img src='".theme_image($link, 'images/tag.png')."'
-                               class='tagsPic' alt='Tags' title='Tags'>&nbsp;";
+       }
 
-                       if (!$zoom_mode) {
-                               $rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>
-                                       <a title=\"".__('Edit tags for this article')."\"
-                                       href=\"#\" onclick=\"editArticleTags($id, $feed_id)\">(+)</a>";
+       function sanitize($link, $str, $force_strip_tags = false, $owner = false, $site_url = false) {
+               global $purifier;
 
-                               $rv['content'] .= "<div dojoType=\"dijit.Tooltip\"
-                                       id=\"ATSTRTIP-$id\" connectId=\"ATSTR-$id\"
-                                       position=\"below\">$tags_str_full</div>";
+               if (!$owner) $owner = $_SESSION["uid"];
 
-                               $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-zoom.png')."\"
-                                               class='tagsPic' style=\"cursor : pointer\"
-                                               onclick=\"postOpenInNewTab(event, $id)\"
-                                               alt='Zoom' title='".__('Open article in new tab')."'>";
+               $res = trim($str); if (!$res) return '';
 
-                               //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
+               // create global Purifier object if needed
+               if (!$purifier) {
+                       require_once 'lib/htmlpurifier/library/HTMLPurifier.auto.php';
 
-                               $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-pub-note.png')."\"
-                                               class='tagsPic' style=\"cursor : pointer\"
-                                               onclick=\"editArticleNote($id)\"
-                                               alt='PubNote' title='".__('Edit article note')."'>";
+                       $config = HTMLPurifier_Config::createDefault();
 
-                               if (DIGEST_ENABLE) {
-                                       $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-email.png')."\"
-                                               class='tagsPic' style=\"cursor : pointer\"
-                                               onclick=\"emailArticle($id)\"
-                                               alt='Zoom' title='".__('Forward by email')."'>";
-                               }
+                       $allowed = "p,a[href],i,em,b,strong,code,pre,blockquote,br,img[src|alt|title],ul,ol,li,h1,h2,h3,h4,s,object[classid|type|id|name|width|height|codebase],param[name|value],table,tr,td";
 
-                               if (ENABLE_TWEET_BUTTON) {
-                                       $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-tweet.png')."\"
-                                                       class='tagsPic' style=\"cursor : pointer\"
-                                                       onclick=\"tweetArticle($id)\"
-                                                       alt='Zoom' title='".__('Share on Twitter')."'>";
-                               }
+                       $config->set('HTML.SafeObject', true);
+                       @$config->set('HTML', 'Allowed', $allowed);
+                       $config->set('Output.FlashCompat', true);
+                       $config->set('Attr.EnableID', true);
+                       if (!defined('MOBILE_VERSION')) {
+                               @$config->set('Cache', 'SerializerPath', CACHE_DIR . "/htmlpurifier");
+                       } else {
+                               @$config->set('Cache', 'SerializerPath', "../" . CACHE_DIR . "/htmlpurifier");
+                       }
 
-                               $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-share.png')."\"
-                                       class='tagsPic' style=\"cursor : pointer\"
-                                       onclick=\"shareArticle(".$line['int_id'].")\"
-                                       alt='Zoom' title='".__('Share by URL')."'>";
+                       $purifier = new HTMLPurifier($config);
+               }
 
-                               $rv['content'] .= "<img src=\"".theme_image($link, 'images/digest_checkbox.png')."\"
-                                               class='tagsPic' style=\"cursor : pointer\"
-                                               onclick=\"closeArticlePanel($id)\"
-                                               alt='Zoom' title='".__('Close this panel')."'>";
+               $res = $purifier->purify($res);
 
-                       } else {
-                               $tags_str = strip_tags($tags_str);
-                               $rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>";
-                       }
-                       $rv['content'] .= "</div>";
-                       $rv['content'] .= "<div clear='both'>$entry_comments</div>";
+               if (get_pref($link, "STRIP_IMAGES", $owner)) {
+                       $res = preg_replace('/<img[^>]+>/is', '', $res);
+               }
 
-                       if ($line["orig_feed_id"]) {
+               if (strpos($res, "href=") === false)
+                       $res = rewrite_urls($res);
 
-                               $tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds
-                                       WHERE id = ".$line["orig_feed_id"]);
+               $charset_hack = '<head>
+                       <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+               </head>';
 
-                               if (db_num_rows($tmp_result) != 0) {
+               $res = trim($res); if (!$res) return '';
 
-                                       $rv['content'] .= "<div clear='both'>";
-                                       $rv['content'] .= __("Originally from:");
+               libxml_use_internal_errors(true);
 
-                                       $rv['content'] .= "&nbsp;";
+               $doc = new DOMDocument();
+               $doc->loadHTML($charset_hack . $res);
+               $xpath = new DOMXPath($doc);
 
-                                       $tmp_line = db_fetch_assoc($tmp_result);
+               $entries = $xpath->query('(//a[@href]|//img[@src])');
+               $br_inserted = 0;
+
+               foreach ($entries as $entry) {
 
-                                       $rv['content'] .= "<a target='_blank'
-                                               href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
-                                               $tmp_line['title'] . "</a>";
+                       if ($site_url) {
 
-                                       $rv['content'] .= "&nbsp;";
+                               if ($entry->hasAttribute('href'))
+                                       $entry->setAttribute('href',
+                                               rewrite_relative_url($site_url, $entry->getAttribute('href')));
 
-                                       $rv['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
-                                       $rv['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";
+                               if ($entry->hasAttribute('src'))
+                                       if (preg_match('/^image.php\?i=[a-z0-9]+$/', $entry->getAttribute('src')) == 0)
+                                               $entry->setAttribute('src',
+                                                       rewrite_relative_url($site_url, $entry->getAttribute('src')));
+                       }
 
-                                       $rv['content'] .= "</div>";
-                               }
+                       if (strtolower($entry->nodeName) == "a") {
+                               $entry->setAttribute("target", "_blank");
                        }
 
-                       $rv['content'] .= "</div>";
+                       if (strtolower($entry->nodeName) == "img" && !$br_inserted) {
+                               $br = $doc->createElement("br");
 
-                       $rv['content'] .= "<div id=\"POSTNOTE-$id\">";
-                               if ($line['note']) {
-                                       $rv['content'] .= format_article_note($id, $line['note']);
+                               if ($entry->parentNode->nextSibling) {
+                                       $entry->parentNode->insertBefore($br, $entry->nextSibling);
+                                       $br_inserted = 1;
                                }
-                       $rv['content'] .= "</div>";
 
-                       $rv['content'] .= "<div class=\"postIcon\">" .
-                               "<a target=\"_blank\" title=\"".__("Visit the website")."\"$
-                               href=\"".htmlspecialchars($feed_site_url)."\">".
-                               $feed_icon . "</a></div>";
+                       }
+               }
 
-                       $rv['content'] .= "<div class=\"postContent\">";
+               $node = $doc->getElementsByTagName('body')->item(0);
 
-                       $article_content = sanitize_rss($link, $line["content"], false, false,
-                               $feed_site_url);
+               return $doc->saveXML($node);
+       }
 
-                       $rv['content'] .= $article_content;
+       /**
+        * Send by mail a digest of last articles.
+        *
+        * @param mixed $link The database connection.
+        * @param integer $limit The maximum number of articles by digest.
+        * @return boolean Return false if digests are not enabled.
+        */
+       function send_headlines_digests($link, $limit = 100, $debug = true) {
 
-                       $rv['content'] .= format_article_enclosures($link, $id,
-                               $always_display_enclosures, $article_content);
+               require_once 'lib/phpmailer/class.phpmailer.php';
 
-                       $rv['content'] .= "</div>";
+               $user_limit = 15; // amount of users to process (e.g. emails to send out)
+               $days = 1;
 
-                       $rv['content'] .= "</div>";
+               if ($debug) _debug("Sending digests, batch of max $user_limit users, days = $days, headline limit = $limit");
 
+               if (DB_TYPE == "pgsql") {
+                       $interval_query = "last_digest_sent < NOW() - INTERVAL '$days days'";
+               } else if (DB_TYPE == "mysql") {
+                       $interval_query = "last_digest_sent < DATE_SUB(NOW(), INTERVAL $days DAY)";
                }
 
-               if ($zoom_mode) {
-                       $rv['content'] .= "
-                               <div style=\"text-align : center\">
-                               <button onclick=\"return window.close()\">".
-                                       __("Close this window")."</button></div>";
-                       $rv['content'] .= "</body></html>";
-               }
+               $result = db_query($link, "SELECT id,email FROM ttrss_users
+                               WHERE email != '' AND (last_digest_sent IS NULL OR $interval_query)");
 
-               return $rv;
+               while ($line = db_fetch_assoc($result)) {
 
-       }
+                       if (get_pref($link, 'DIGEST_ENABLE', $line['id'], false)) {
+                               print "Sending digest for UID:" . $line['id'] . " - " . $line["email"] . " ... ";
 
-       function format_headlines_list($link, $feed, $method, $view_mode, $limit, $cat_view,
-                                       $next_unread_feed, $offset, $vgr_last_feed = false,
-                                       $override_order = false) {
+                               $do_catchup = get_pref($link, 'DIGEST_CATCHUP', $line['id'], false);
 
-               $disable_cache = false;
+                               $tuple = prepare_headlines_digest($link, $line["id"], $days, $limit);
+                               $digest = $tuple[0];
+                               $headlines_count = $tuple[1];
+                               $affected_ids = $tuple[2];
+                               $digest_text = $tuple[3];
 
-               $reply = array();
+                               if ($headlines_count > 0) {
 
-               $timing_info = getmicrotime();
+                                       $mail = new PHPMailer();
 
-               $topmost_article_ids = array();
+                                       $mail->PluginDir = "lib/phpmailer/";
+                                       $mail->SetLanguage("en", "lib/phpmailer/language/");
 
-               if (!$offset) $offset = 0;
-               if ($method == "undefined") $method = "";
+                                       $mail->CharSet = "UTF-8";
 
-               $method_split = explode(":", $method);
+                                       $mail->From = SMTP_FROM_ADDRESS;
+                                       $mail->FromName = SMTP_FROM_NAME;
+                                       $mail->AddAddress($line["email"], $line["login"]);
 
-/*             if ($method == "CatchupSelected") {
-                       $ids = explode(",", db_escape_string($_REQUEST["ids"]));
-                       $cmode = sprintf("%d", $_REQUEST["cmode"]);
+                                       if (SMTP_HOST) {
+                                               $mail->Host = SMTP_HOST;
+                                               $mail->Mailer = "smtp";
+                                               $mail->SMTPAuth = SMTP_LOGIN != '';
+                                               $mail->Username = SMTP_LOGIN;
+                                               $mail->Password = SMTP_PASSWORD;
+                                       }
 
-                       catchupArticlesById($link, $ids, $cmode);
-               } */
+                                       $mail->IsHTML(true);
+                                       $mail->Subject = DIGEST_SUBJECT;
+                                       $mail->Body = $digest;
+                                       $mail->AltBody = $digest_text;
 
-               if ($method == "ForceUpdate" && $feed && is_numeric($feed) > 0) {
-                       update_rss_feed($link, $feed, true);
-               }
+                                       $rc = $mail->Send();
+
+                                       if (!$rc) print "ERROR: " . $mail->ErrorInfo;
 
-               if ($method == "MarkAllRead")  {
-                       catchup_feed($link, $feed, $cat_view);
+                                       print "RC=$rc\n";
 
-                       if (get_pref($link, 'ON_CATCHUP_SHOW_NEXT_FEED')) {
-                               if ($next_unread_feed) {
-                                       $feed = $next_unread_feed;
+                                       if ($rc && $do_catchup) {
+                                               print "Marking affected articles as read...\n";
+                                               catchupArticlesById($link, $affected_ids, 0, $line["id"]);
+                                       }
+                               } else {
+                                       print "No headlines\n";
                                }
+
+                               db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW()
+                                       WHERE id = " . $line["id"]);
                        }
                }
 
-               if ($method_split[0] == "MarkAllReadGR")  {
-                       catchup_feed($link, $method_split[1], false);
-               }
+               if ($debug) _debug("All done.");
 
-               // FIXME: might break tag display?
+       }
 
-               if (is_numeric($feed) && $feed > 0 && !$cat_view) {
-                       $result = db_query($link,
-                               "SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1");
+       function prepare_headlines_digest($link, $user_id, $days = 1, $limit = 100) {
 
-                       if (db_num_rows($result) == 0) {
-                               $reply['content'] = "<div align='center'>".__('Feed not found.')."</div>";
-                       }
-               }
+               require_once "lib/MiniTemplator.class.php";
 
-               if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
+               $tpl = new MiniTemplator;
+               $tpl_t = new MiniTemplator;
 
-                       $result = db_query($link, "SELECT rtl_content FROM ttrss_feeds
-                               WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
+               $tpl->readTemplateFromFile("templates/digest_template_html.txt");
+               $tpl_t->readTemplateFromFile("templates/digest_template.txt");
 
-                       if (db_num_rows($result) == 1) {
-                               $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
-                       } else {
-                               $rtl_content = false;
-                       }
+               $tpl->setVariable('CUR_DATE', date('Y/m/d'));
+               $tpl->setVariable('CUR_TIME', date('G:i'));
 
-                       if ($rtl_content) {
-                               $rtl_tag = "dir=\"RTL\"";
-                       } else {
-                               $rtl_tag = "";
-                       }
-               } else {
-                       $rtl_tag = "";
-                       $rtl_content = false;
-               }
+               $tpl_t->setVariable('CUR_DATE', date('Y/m/d'));
+               $tpl_t->setVariable('CUR_TIME', date('G:i'));
 
-               @$search = db_escape_string($_REQUEST["query"]);
+               $affected_ids = array();
 
-               if ($search) {
-                       $disable_cache = true;
+               if (DB_TYPE == "pgsql") {
+                       $interval_query = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
+               } else if (DB_TYPE == "mysql") {
+                       $interval_query = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
                }
 
-               @$search_mode = db_escape_string($_REQUEST["search_mode"]);
-               @$match_on = db_escape_string($_REQUEST["match_on"]);
+               $result = db_query($link, "SELECT ttrss_entries.title,
+                               ttrss_feeds.title AS feed_title,
+                               date_updated,
+                               ttrss_user_entries.ref_id,
+                               link,
+                               SUBSTRING(content, 1, 120) AS excerpt,
+                               ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+                       FROM
+                               ttrss_user_entries,ttrss_entries,ttrss_feeds
+                       WHERE
+                               ref_id = ttrss_entries.id AND feed_id = ttrss_feeds.id
+                               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_updated DESC
+                       LIMIT $limit");
+
+               $cur_feed_title = "";
 
-               if (!$match_on) {
-                       $match_on = "both";
-               }
+               $headlines_count = db_num_rows($result);
 
-               if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
+               $headlines = array();
 
-//             error_log("format_headlines_list: [" . $feed . "] method [" . $method . "]");
-               if( $search_mode == '' && $method != '' ){
-                   $search_mode = $method;
+               while ($line = db_fetch_assoc($result)) {
+                       array_push($headlines, $line);
                }
-//             error_log("search_mode: " . $search_mode);
-               $qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view,
-                       $search, $search_mode, $match_on, $override_order, $offset);
 
-               if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
+               for ($i = 0; $i < sizeof($headlines); $i++) {
 
-               $result = $qfh_ret[0];
-               $feed_title = $qfh_ret[1];
-               $feed_site_url = $qfh_ret[2];
-               $last_error = $qfh_ret[3];
+                       $line = $headlines[$i];
 
-               $vgroup_last_feed = $vgr_last_feed;
+                       array_push($affected_ids, $line["ref_id"]);
 
-//             if (!$offset) {
+                       $updated = make_local_datetime($link, $line['last_updated'], false,
+                               $user_id);
 
-                       if (db_num_rows($result) > 0) {
-                               $reply['toolbar'] = format_headline_subtoolbar($link, $feed_site_url,
-                                       $feed_title,
-                                       $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,
-                                       $last_error);
-                       }
-//             }
+                       $tpl->setVariable('FEED_TITLE', $line["feed_title"]);
+                       $tpl->setVariable('ARTICLE_TITLE', $line["title"]);
+                       $tpl->setVariable('ARTICLE_LINK', $line["link"]);
+                       $tpl->setVariable('ARTICLE_UPDATED', $updated);
+                       $tpl->setVariable('ARTICLE_EXCERPT',
+                               truncate_string(strip_tags($line["excerpt"]), 100));
 
-               $headlines_count = db_num_rows($result);
+                       $tpl->addBlock('article');
 
-               if (db_num_rows($result) > 0) {
+                       $tpl_t->setVariable('FEED_TITLE', $line["feed_title"]);
+                       $tpl_t->setVariable('ARTICLE_TITLE', $line["title"]);
+                       $tpl_t->setVariable('ARTICLE_LINK', $line["link"]);
+                       $tpl_t->setVariable('ARTICLE_UPDATED', $updated);
+//                     $tpl_t->setVariable('ARTICLE_EXCERPT',
+//                             truncate_string(strip_tags($line["excerpt"]), 100));
 
-                       $lnum = $offset;
+                       $tpl_t->addBlock('article');
 
-                       $num_unread = 0;
-                       $cur_feed_title = '';
+                       if ($headlines[$i]['feed_title'] != $headlines[$i+1]['feed_title']) {
+                               $tpl->addBlock('feed');
+                               $tpl_t->addBlock('feed');
+                       }
 
-                       $fresh_intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE") * 60 * 60;
+               }
 
-                       if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);
+               $tpl->addBlock('digest');
+               $tpl->generateOutputToString($tmp);
 
-                       while ($line = db_fetch_assoc($result)) {
+               $tpl_t->addBlock('digest');
+               $tpl_t->generateOutputToString($tmp_t);
+
+               return array($tmp, $headlines_count, $affected_ids, $tmp_t);
+       }
 
-                               $class = ($lnum % 2) ? "even" : "odd";
+       function check_for_update($link) {
+               if (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) {
+                       $version_url = "http://tt-rss.org/version.php?ver=" . VERSION;
 
-                               $id = $line["id"];
-                               $feed_id = $line["feed_id"];
-                               $label_cache = $line["label_cache"];
-                               $labels = false;
+                       $version_data = @fetch_file_contents($version_url);
 
-                               if ($label_cache) {
-                                       $label_cache = json_decode($label_cache, true);
+                       if ($version_data) {
+                               $version_data = json_decode($version_data, true);
+                               if ($version_data && $version_data['version']) {
 
-                                       if ($label_cache) {
-                                               if ($label_cache["no-labels"] == 1)
-                                                       $labels = array();
-                                               else
-                                                       $labels = $label_cache;
+                                       if (version_compare(VERSION, $version_data['version']) == -1) {
+                                               return $version_data;
                                        }
                                }
+                       }
+               }
+               return false;
+       }
 
-                               if (!is_array($labels)) $labels = get_article_labels($link, $id);
+       function markArticlesById($link, $ids, $cmode) {
 
-                               $labels_str = "<span id=\"HLLCTR-$id\">";
-                               $labels_str .= format_article_labels($labels, $id);
-                               $labels_str .= "</span>";
+               $tmp_ids = array();
 
-                               if (count($topmost_article_ids) < 3) {
-                                       array_push($topmost_article_ids, $id);
-                               }
+               foreach ($ids as $id) {
+                       array_push($tmp_ids, "ref_id = '$id'");
+               }
 
-                               if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {
+               $ids_qpart = join(" OR ", $tmp_ids);
 
-                                       $update_pic = "<img id='FUPDPIC-$id' src=\"".
-                                               theme_image($link, 'images/updated.png')."\"
-                                               alt=\"Updated\">";
-                               } else {
-                                       $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"
-                                               alt=\"Updated\">";
-                               }
+               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"]);
+               }
+       }
 
-                               if (sql_bool_to_bool($line["unread"]) &&
-                                       time() - strtotime($line["updated_noms"]) < $fresh_intl) {
+       function publishArticlesById($link, $ids, $cmode) {
 
-                                       $update_pic = "<img id='FUPDPIC-$id' src=\"".
-                                               theme_image($link, 'images/fresh_sign.png')."\" alt=\"Fresh\">";
-                               }
+               $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
+                       published = false,last_read = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+               } else if ($cmode == 1) {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       published = true
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+               } else {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       published = NOT published,last_read = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+               }
+
+               if (PUBSUBHUBBUB_HUB) {
+                       $rss_link = get_self_url_prefix() .
+                               "/public.php?op=rss&id=-2&key=" .
+                               get_feed_access_key($link, -2, false);
 
-                               if ($line["unread"] == "t" || $line["unread"] == "1") {
-                                       $class .= " Unread";
-                                       ++$num_unread;
-                                       $is_unread = true;
-                               } else {
-                                       $is_unread = false;
-                               }
+                       $p = new Publisher(PUBSUBHUBBUB_HUB);
 
-                               if ($line["marked"] == "t" || $line["marked"] == "1") {
-                                       $marked_pic = "<img id=\"FMPIC-$id\"
-                                               src=\"".theme_image($link, 'images/mark_set.png')."\"
-                                               class=\"markedPic\" alt=\"Unstar article\"
-                                               onclick='javascript:toggleMark($id)'>";
-                               } else {
-                                       $marked_pic = "<img id=\"FMPIC-$id\"
-                                               src=\"".theme_image($link, 'images/mark_unset.png')."\"
-                                               class=\"markedPic\" alt=\"Star article\"
-                                               onclick='javascript:toggleMark($id)'>";
-                               }
+                       $pubsub_result = $p->publish_update($rss_link);
+               }
+       }
 
-                               if ($line["published"] == "t" || $line["published"] == "1") {
-                                       $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link,
-                                               'images/pub_set.png')."\"
-                                               class=\"markedPic\"
-                                               alt=\"Unpublish article\" onclick='javascript:togglePub($id)'>";
-                               } else {
-                                       $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link,
-                                               'images/pub_unset.png')."\"
-                                               class=\"markedPic\"
-                                               alt=\"Publish article\" onclick='javascript:togglePub($id)'>";
-                               }
+       function catchupArticlesById($link, $ids, $cmode, $owner_uid = false) {
 
-#                              $content_link = "<a target=\"_blank\" href=\"".$line["link"]."\">" .
-#                                      $line["title"] . "</a>";
+               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+               if (count($ids) == 0) return;
 
-#                              $content_link = "<a
-#                                      href=\"" . htmlspecialchars($line["link"]) . "\"
-#                                      onclick=\"view($id,$feed_id);\">" .
-#                                      $line["title"] . "</a>";
+               $tmp_ids = array();
 
-#                              $content_link = "<a href=\"javascript:viewContentUrl('".$line["link"]."');\">" .
-#                                      $line["title"] . "</a>";
+               foreach ($ids as $id) {
+                       array_push($tmp_ids, "ref_id = '$id'");
+               }
 
-                               $updated_fmt = make_local_datetime($link, $line["updated_noms"], false);
+               $ids_qpart = join(" OR ", $tmp_ids);
 
-                               if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
-                                       $content_preview = truncate_string(strip_tags($line["content_preview"]),
-                                               100);
-                               }
+               if ($cmode == 0) {
+                       db_query($link, "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
+                       unread = true
+                       WHERE ($ids_qpart) AND owner_uid = $owner_uid");
+               } else {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       unread = NOT unread,last_read = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = $owner_uid");
+               }
 
-                               $score = $line["score"];
+               /* update ccache */
 
-                               $score_pic = theme_image($link,
-                                       "images/" . get_score_pic($score));
+               $result = db_query($link, "SELECT DISTINCT feed_id FROM ttrss_user_entries
+                       WHERE ($ids_qpart) AND owner_uid = $owner_uid");
 
-/*                             $score_title = __("(Click to change)");
-                               $score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"
-                                       onclick=\"adjustArticleScore($id, $score)\" title=\"$score $score_title\">"; */
+               while ($line = db_fetch_assoc($result)) {
+                       ccache_update($link, $line["feed_id"], $owner_uid);
+               }
+       }
 
-                               $score_pic = "<img class='hlScorePic' src=\"$score_pic\"
-                                       title=\"$score\">";
+       function catchupArticleById($link, $id, $cmode) {
 
-                               if ($score > 500) {
-                                       $hlc_suffix = "H";
-                               } else if ($score < -100) {
-                                       $hlc_suffix = "L";
-                               } else {
-                                       $hlc_suffix = "";
-                               }
+               if ($cmode == 0) {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       unread = false,last_read = NOW()
+                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+               } else if ($cmode == 1) {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       unread = true
+                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+               } else {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       unread = NOT unread,last_read = NOW()
+                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+               }
 
-                               $entry_author = $line["author"];
+               $feed_id = getArticleFeed($link, $id);
+               ccache_update($link, $feed_id, $_SESSION["uid"]);
+       }
 
-                               if ($entry_author) {
-                                       $entry_author = " - $entry_author";
-                               }
+       function make_guid_from_title($title) {
+               return preg_replace("/[ \"\',.:;]/", "-",
+                       mb_strtolower(strip_tags($title), 'utf-8'));
+       }
 
-                               $has_feed_icon = feed_has_icon($feed_id);
+       function get_article_tags($link, $id, $owner_uid = 0, $tag_cache = false) {
 
-                               if ($has_feed_icon) {
-                                       $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
-                               } else {
-                                       $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/feed-icon-12x12.png\" alt=\"\">";
-                               }
+               global $memcache;
 
-                               if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+               $a_id = db_escape_string($id);
 
-                                       if (get_pref($link, 'VFEED_GROUP_BY_FEED')) {
-                                               if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
+               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-                                                       $cur_feed_title = $line["feed_title"];
-                                                       $vgroup_last_feed = $feed_id;
+               $query = "SELECT DISTINCT tag_name,
+                       owner_uid as owner FROM
+                       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";
 
-                                                       $cur_feed_title = htmlspecialchars($cur_feed_title);
+               $obj_id = md5("TAGS:$owner_uid:$id");
+               $tags = array();
 
-                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
+               if ($memcache && $obj = $memcache->get($obj_id)) {
+                       $tags = $obj;
+               } else {
+                       /* check cache first */
 
-                                                       $reply['content'] .= "<div class='cdmFeedTitle'>".
-                                                               "<div style=\"float : right\">$feed_icon_img</div>".
-                                                               "<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
-                                                               $line["feed_title"]."</a> $vf_catchup_link</div>";
+                       if ($tag_cache === false) {
+                               $result = db_query($link, "SELECT tag_cache FROM ttrss_user_entries
+                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
-                                               }
-                                       }
+                               $tag_cache = db_fetch_result($result, 0, "tag_cache");
+                       }
 
-                                       $mouseover_attrs = "onmouseover='postMouseIn($id)'
-                                               onmouseout='postMouseOut($id)'";
+                       if ($tag_cache) {
+                               $tags = explode(",", $tag_cache);
+                       } else {
 
-                                       $reply['content'] .= "<div class='$class' id='RROW-$id' $mouseover_attrs>";
+                               /* do it the hard way */
 
-                                       $reply['content'] .= "<div class='hlUpdPic'>$update_pic</div>";
+                               $tmp_result = db_query($link, $query);
 
-                                       $reply['content'] .= "<div class='hlLeft'>";
+                               while ($tmp_line = db_fetch_assoc($tmp_result)) {
+                                       array_push($tags, $tmp_line["tag_name"]);
+                               }
 
-                                       $reply['content'] .= "<input type=\"checkbox\" onclick=\"tSR(this)\"
-                                                       id=\"RCHK-$id\">";
+                               /* update the cache */
 
-                                       $reply['content'] .= "$marked_pic";
-                                       $reply['content'] .= "$published_pic";
+                               $tags_str = db_escape_string(join(",", $tags));
 
-                                       $reply['content'] .= "</div>";
+                               db_query($link, "UPDATE ttrss_user_entries
+                                       SET tag_cache = '$tags_str' WHERE ref_id = '$id'
+                                       AND owner_uid = " . $_SESSION["uid"]);
+                       }
 
-                                       $reply['content'] .= "<div onclick='return hlClicked(event, $id)'
-                                               class=\"hlTitle\"><span class='hlContent$hlc_suffix'>";
-                                       $reply['content'] .= "<a id=\"RTITLE-$id\"
-                                               href=\"" . htmlspecialchars($line["link"]) . "\"
-                                               onclick=\"\">" .
-                                               truncate_string($line["title"], 200);
+                       if ($memcache) $memcache->add($obj_id, $tags, 0, 3600);
+               }
 
-                                       if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
-                                               if ($content_preview) {
-                                                       $reply['content'] .= "<span class=\"contentPreview\"> - $content_preview</span>";
-                                               }
-                                       }
+               return $tags;
+       }
 
-                                       $reply['content'] .= "</a></span>";
+       function trim_array($array) {
+               $tmp = $array;
+               array_walk($tmp, 'trim');
+               return $tmp;
+       }
 
-                                       $reply['content'] .= $labels_str;
+       function tag_is_valid($tag) {
+               if ($tag == '') return false;
+               if (preg_match("/^[0-9]*$/", $tag)) return false;
+               if (mb_strlen($tag) > 250) return false;
 
-                                       if (!get_pref($link, 'VFEED_GROUP_BY_FEED') &&
-                                               defined('_SHOW_FEED_TITLE_IN_VFEEDS')) {
-                                               if (@$line["feed_title"]) {
-                                                       $reply['content'] .= "<span class=\"hlFeed\">
-                                                               (<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
-                                                               $line["feed_title"]."</a>)
-                                                       </span>";
-                                               }
-                                       }
+               if (function_exists('iconv')) {
+                       $tag = iconv("utf-8", "utf-8", $tag);
+               }
 
-                                       $reply['content'] .= "</div>";
+               if (!$tag) return false;
 
-                                       $reply['content'] .= "<span class=\"hlUpdated\">$updated_fmt</span>";
-                                       $reply['content'] .= "<div class=\"hlRight\">";
+               return true;
+       }
 
-                                       $reply['content'] .= $score_pic;
+       function render_login_form($link, $mobile = 0) {
+               switch ($mobile) {
+               case 0:
+                       require_once "login_form.php";
+                       break;
+               case 1:
+                       require_once "mobile/login_form.php";
+                       break;
+               case 2:
+                       require_once "mobile/classic/login_form.php";
+               }
+       }
 
-                                       if ($line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
+       // 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
+       }
 
-                                               $reply['content'] .= "<span onclick=\"viewfeed($feed_id)\"
-                                                       style=\"cursor : pointer\"
-                                                       title=\"".htmlspecialchars($line['feed_title'])."\">
-                                                       $feed_icon_img<span>";
-                                       }
+       function format_warning($msg, $id = "") {
+               global $link;
+               return "<div class=\"warning\" id=\"$id\">
+                       <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
+       }
 
-                                       $reply['content'] .= "</div>";
-                                       $reply['content'] .= "</div>";
+       function format_notice($msg, $id = "") {
+               global $link;
+               return "<div class=\"notice\" id=\"$id\">
+                       <img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>";
+       }
 
-                               } else {
+       function format_error($msg, $id = "") {
+               global $link;
+               return "<div class=\"error\" id=\"$id\">
+                       <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
+       }
 
-                                       if (get_pref($link, 'VFEED_GROUP_BY_FEED') && $line["feed_title"]) {
-                                               if ($feed_id != $vgroup_last_feed) {
+       function print_notice($msg) {
+               return print format_notice($msg);
+       }
 
-                                                       $cur_feed_title = $line["feed_title"];
-                                                       $vgroup_last_feed = $feed_id;
+       function print_warning($msg) {
+               return print format_warning($msg);
+       }
 
-                                                       $cur_feed_title = htmlspecialchars($cur_feed_title);
+       function print_error($msg) {
+               return print format_error($msg);
+       }
 
-                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
 
-                                                       $has_feed_icon = feed_has_icon($feed_id);
+       function T_sprintf() {
+               $args = func_get_args();
+               return vsprintf(__(array_shift($args)), $args);
+       }
 
-                                                       if ($has_feed_icon) {
-                                                               $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
-                                                       } else {
-                                                               //$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
-                                                       }
+       function format_inline_player($link, $url, $ctype) {
 
-                                                       $reply['content'] .= "<div class='cdmFeedTitle'>".
-                                                               "<div style=\"float : right\">$feed_icon_img</div>".
-                                                               "<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
-                                                               $line["feed_title"]."</a> $vf_catchup_link</div>";
-                                               }
-                                       }
+               $entry = "";
 
-                                       $expand_cdm = get_pref($link, 'CDM_EXPANDED');
+               if (strpos($ctype, "audio/") === 0) {
 
-                                       $mouseover_attrs = "onmouseover='postMouseIn($id)'
-                                               onmouseout='postMouseOut($id)'";
+                       if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
+                               strpos($_SERVER['HTTP_USER_AGENT'], "Chrome") !== false ||
+                               strpos($_SERVER['HTTP_USER_AGENT'], "Safari") !== false )) {
 
-                                       $reply['content'] .= "<div class=\"$class\"
-                                               id=\"RROW-$id\" $mouseover_attrs'>";
+                               $id = 'AUDIO-' . uniqid();
 
-                                       $reply['content'] .= "<div class=\"cdmHeader\">";
+                               $entry .= "<audio id=\"$id\"\">
+                                       <source src=\"$url\"></source>
+                                       </audio>";
 
-                                       $reply['content'] .= "<div>";
+                               $entry .= "<span onclick=\"player(this)\"
+                                       title=\"".__("Click to play")."\" status=\"0\"
+                                       class=\"player\" audio-id=\"$id\">".__("Play")."</span>";
 
-                                       $reply['content'] .= "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
-                                                       'RROW-$id')\" id=\"RCHK-$id\"/>";
+                       } else {
 
-                                       $reply['content'] .= "$marked_pic";
-                                       $reply['content'] .= "$published_pic";
+                               $entry .= "<object type=\"application/x-shockwave-flash\"
+                                       data=\"lib/button/musicplayer.swf?song_url=$url\"
+                                       width=\"17\" height=\"17\" style='float : left; margin-right : 5px;'>
+                                       <param name=\"movie\"
+                                               value=\"lib/button/musicplayer.swf?song_url=$url\" />
+                                       </object>";
+                       }
+               }
 
-                                       $reply['content'] .= "</div>";
+               $filename = substr($url, strrpos($url, "/")+1);
 
-                                       $reply['content'] .= "<span id=\"RTITLE-$id\"
-                                               onclick=\"return cdmClicked(event, $id);\"
-                                               class=\"titleWrap$hlc_suffix\">
-                                               <a class=\"title\"
-                                               title=\"".htmlspecialchars($line['title'])."\"
-                                               target=\"_blank\" href=\"".
-                                               htmlspecialchars($line["link"])."\">".
-                                               truncate_string($line["title"], 100) .
-                                               " $entry_author</a>";
+               $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
+                       $filename . " (" . $ctype . ")" . "</a>";
 
-                                       $reply['content'] .= $labels_str;
+               return $entry;
+       }
 
-                                       if (!get_pref($link, 'VFEED_GROUP_BY_FEED') &&
-                                               defined('_SHOW_FEED_TITLE_IN_VFEEDS')) {
-                                               if (@$line["feed_title"]) {
-                                                       $reply['content'] .= "<span class=\"hlFeed\">
-                                                               (<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
-                                                               $line["feed_title"]."</a>)
-                                                       </span>";
-                                               }
-                                       }
+       function format_article($link, $id, $mark_as_read = true, $zoom_mode = false) {
 
-                                       if (!$expand_cdm)
-                                               $content_hidden = "style=\"display : none\"";
-                                       else
-                                               $excerpt_hidden = "style=\"display : none\"";
+               $rv = array();
 
-                                       $reply['content'] .= "<span $excerpt_hidden
-                                               id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>";
+               $rv['id'] = $id;
 
-                                       $reply['content'] .= "</span>";
+               /* we can figure out feed_id from article id anyway, why do we
+                * pass feed_id here? let's ignore the argument :( */
 
-                                       $reply['content'] .= "<div>";
-                                       $reply['content'] .= "<span class='updated'>$updated_fmt</span>";
-                                       $reply['content'] .= "$score_pic";
+               $result = db_query($link, "SELECT feed_id FROM ttrss_user_entries
+                       WHERE ref_id = '$id'");
 
-                                       if (!get_pref($link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
-                                               $reply['content'] .= "<span style=\"cursor : pointer\"
-                                                       title=\"".htmlspecialchars($line["feed_title"])."\"
-                                                       onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
-                                       }
-                                       $reply['content'] .= "<div class=\"updPic\">$update_pic</div>";
-                                       $reply['content'] .= "</div>";
+               $feed_id = (int) db_fetch_result($result, 0, "feed_id");
 
-                                       $reply['content'] .= "</div>";
+               $rv['feed_id'] = $feed_id;
 
-                                       $reply['content'] .= "<div class=\"cdmContent\" $content_hidden
-                                               onclick=\"return cdmClicked(event, $id);\"
-                                               id=\"CICD-$id\">";
+               //if (!$zoom_mode) { print "<article id='$id'><![CDATA["; };
 
-                                       $reply['content'] .= "<div class=\"cdmContentInner\">";
+               $result = db_query($link, "SELECT rtl_content, always_display_enclosures FROM ttrss_feeds
+                       WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
 
-                       if ($line["orig_feed_id"]) {
+               if (db_num_rows($result) == 1) {
+                       $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
+                       $always_display_enclosures = sql_bool_to_bool(db_fetch_result($result, 0, "always_display_enclosures"));
+               } else {
+                       $rtl_content = false;
+                       $always_display_enclosures = false;
+               }
 
-                               $tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds
-                                       WHERE id = ".$line["orig_feed_id"]);
+               if ($rtl_content) {
+                       $rtl_tag = "dir=\"RTL\"";
+                       $rtl_class = "RTL";
+               } else {
+                       $rtl_tag = "";
+                       $rtl_class = "";
+               }
 
-                                               if (db_num_rows($tmp_result) != 0) {
+               if ($mark_as_read) {
+                       $result = db_query($link, "UPDATE ttrss_user_entries
+                               SET unread = false,last_read = NOW()
+                               WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
-                                                       $reply['content'] .= "<div clear='both'>";
-                                                       $reply['content'] .= __("Originally from:");
+                       ccache_update($link, $feed_id, $_SESSION["uid"]);
+               }
 
-                                                       $reply['content'] .= "&nbsp;";
+               $result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
+                       ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
+                       (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
+                       (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
+                       num_comments,
+                       tag_cache,
+                       author,
+                       orig_feed_id,
+                       note
+                       FROM ttrss_entries,ttrss_user_entries
+                       WHERE   id = '$id' AND ref_id = id AND owner_uid = " . $_SESSION["uid"]);
 
-                                                       $tmp_line = db_fetch_assoc($tmp_result);
+               if ($result) {
 
-                                                       $reply['content'] .= "<a target='_blank'
-                                                               href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
-                                                               $tmp_line['title'] . "</a>";
+                       $line = db_fetch_assoc($result);
 
-                                                       $reply['content'] .= "&nbsp;";
+                       if ($line["icon_url"]) {
+                               $feed_icon = "<img src=\"" . $line["icon_url"] . "\">";
+                       } else {
+                               $feed_icon = "&nbsp;";
+                       }
 
-                                                       $reply['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
-                                                       $reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";
+                       $feed_site_url = $line['site_url'];
 
-                                                       $reply['content'] .= "</div>";
-                                               }
-                                       }
+                       $num_comments = $line["num_comments"];
+                       $entry_comments = "";
 
-                                       $feed_site_url = $line["site_url"];
+                       if ($num_comments > 0) {
+                               if ($line["comments"]) {
+                                       $comments_url = $line["comments"];
+                               } else {
+                                       $comments_url = $line["link"];
+                               }
+                               $entry_comments = "<a target='_blank' href=\"$comments_url\">$num_comments comments</a>";
+                       } else {
+                               if ($line["comments"] && $line["link"] != $line["comments"]) {
+                                       $entry_comments = "<a target='_blank' href=\"".$line["comments"]."\">comments</a>";
+                               }
+                       }
 
-                                       $article_content = sanitize_rss($link, $line["content_preview"],
-                                                       false, false, $feed_site_url);
+                       if ($zoom_mode) {
+                               header("Content-Type: text/html");
+                               $rv['content'] .= "<html><head>
+                                               <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
+                                               <title>Tiny Tiny RSS - ".$line["title"]."</title>
+                                               <link rel=\"stylesheet\" type=\"text/css\" href=\"tt-rss.css\">
+                                       </head><body>";
+                       }
 
-                                       $reply['content'] .= "<div id=\"POSTNOTE-$id\">";
-                                       if ($line['note']) {
-                                               $reply['content'] .= format_article_note($id, $line['note']);
-                                       }
-                                       $reply['content'] .= "</div>";
+                       $rv['content'] .= "<div id=\"PTITLE-$id\" style=\"display : none\">" .
+                               truncate_string(strip_tags($line['title']), 15) . "</div>";
 
-                                       $reply['content'] .= "<span id=\"CWRAP-$id\">";
-                                       $reply['content'] .= $expand_cdm ? $article_content : '';
-                                       $reply['content'] .= "</span>";
+                       $rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">";
 
-/*                                     $tmp_result = db_query($link, "SELECT always_display_enclosures FROM
-                                               ttrss_feeds WHERE id = ".
-                                               (($line['feed_id'] == null) ? $line['orig_feed_id'] :
-                                                       $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]);
+                       $rv['content'] .= "<div onclick=\"return postClicked(event, $id)\"
+                               class=\"postHeader\" id=\"POSTHDR-$id\">";
 
-                                       $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result,
-                                               0, "always_display_enclosures")); */
+                       $entry_author = $line["author"];
 
-                                       $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
+                       if ($entry_author) {
+                               $entry_author = __(" - ") . $entry_author;
+                       }
 
-                                       $reply['content'] .= format_article_enclosures($link, $id, $always_display_enclosures,
-                                               $article_content);
+                       $parsed_updated = make_local_datetime($link, $line["updated"], true,
+                               false, true);
 
-                                       $reply['content'] .= "</div>";
+                       $rv['content'] .= "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
 
-                                       $reply['content'] .= "<div class=\"cdmFooter\">";
+                       if ($line["link"]) {
+                               $rv['content'] .= "<div clear='both'><a target='_blank'
+                                       title=\"".htmlspecialchars($line['title'])."\"
+                                       href=\"" .
+                                       $line["link"] . "\">" .
+                                       truncate_string($line["title"], 100) .
+                                       "<span class='author'>$entry_author</span></a></div>";
+                       } else {
+                               $rv['content'] .= "<div clear='both'>" . $line["title"] . "$entry_author</div>";
+                       }
 
-                                       $tag_cache = $line["tag_cache"];
+                       $tag_cache = $line["tag_cache"];
 
-                                       $tags_str = format_tags_string(
-                                               get_article_tags($link, $id, $_SESSION["uid"], $tag_cache),
-                                               $id);
+                       if (!$tag_cache)
+                               $tags = get_article_tags($link, $id);
+                       else
+                               $tags = explode(",", $tag_cache);
 
-                                       $reply['content'] .= "<img src='".theme_image($link,
-                                                       'images/tag.png')."' alt='Tags' title='Tags'>
-                                               <span id=\"ATSTR-$id\">$tags_str</span>
-                                               <a title=\"".__('Edit tags for this article')."\"
-                                               href=\"#\" onclick=\"editArticleTags($id, $feed_id, true)\">(+)</a>";
+                       $tags_str = format_tags_string($tags, $id);
+                       $tags_str_full = join(", ", $tags);
 
-                                       $num_comments = $line["num_comments"];
-                                       $entry_comments = "";
+                       if (!$tags_str_full) $tags_str_full = __("no tags");
 
-                                       if ($num_comments > 0) {
-                                               if ($line["comments"]) {
-                                                       $comments_url = $line["comments"];
-                                               } else {
-                                                       $comments_url = $line["link"];
-                                               }
-                                               $entry_comments = "<a target='_blank' href=\"$comments_url\">$num_comments comments</a>";
-                                       } else {
-                                               if ($line["comments"] && $line["link"] != $line["comments"]) {
-                                                       $entry_comments = "<a target='_blank' href=\"".$line["comments"]."\">comments</a>";
-                                               }
-                                       }
+                       if (!$entry_comments) $entry_comments = "&nbsp;"; # placeholder
 
-                                       if ($entry_comments) $reply['content'] .= "&nbsp;($entry_comments)";
+                       $rv['content'] .= "<div style='float : right'>
+                               <img src='".theme_image($link, 'images/tag.png')."'
+                               class='tagsPic' alt='Tags' title='Tags'>&nbsp;";
 
-                                       $reply['content'] .= "<div style=\"float : right\">";
+                       if (!$zoom_mode) {
+                               $rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>
+                                       <a title=\"".__('Edit tags for this article')."\"
+                                       href=\"#\" onclick=\"editArticleTags($id, $feed_id)\">(+)</a>";
 
-                                       $reply['content'] .= "<img src=\"images/art-zoom.png\"
-                                               onclick=\"zoomToArticle(event, $id)\"
-                                               style=\"cursor : pointer\"
-                                               alt='Zoom'
-                                               title='".__('Open article in new tab')."'>";
+                               $rv['content'] .= "<div dojoType=\"dijit.Tooltip\"
+                                       id=\"ATSTRTIP-$id\" connectId=\"ATSTR-$id\"
+                                       position=\"below\">$tags_str_full</div>";
 
-                                       //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
+                               $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-zoom.png')."\"
+                                               class='tagsPic' style=\"cursor : pointer\"
+                                               onclick=\"postOpenInNewTab(event, $id)\"
+                                               alt='Zoom' title='".__('Open article in new tab')."'>";
 
-                                       $reply['content'] .= "<img src=\"images/art-pub-note.png\"
-                                               style=\"cursor : pointer\" style=\"cursor : pointer\"
-                                               onclick=\"editArticleNote($id)\"
-                                               alt='PubNote' title='".__('Edit article note')."'>";
+                               $button_plugins = explode(",", ARTICLE_BUTTON_PLUGINS);
 
-                                       if (DIGEST_ENABLE) {
-                                               $reply['content'] .= "<img src=\"".theme_image($link, 'images/art-email.png')."\"
-                                                       style=\"cursor : pointer\"
-                                                       onclick=\"emailArticle($id)\"
-                                                       alt='Zoom' title='".__('Forward by email')."'>";
-                                       }
+                               foreach ($button_plugins as $p) {
+                                       $pclass = trim("${p}_button");
 
-                                       if (ENABLE_TWEET_BUTTON) {
-                                               $reply['content'] .= "<img src=\"".theme_image($link, 'images/art-tweet.png')."\"
-                                                       class='tagsPic' style=\"cursor : pointer\"
-                                                       onclick=\"tweetArticle($id)\"
-                                                       alt='Zoom' title='".__('Share on Twitter')."'>";
+                                       if (class_exists($pclass)) {
+                                               $plugin = new $pclass($link);
+                                               $rv['content'] .= $plugin->render($id, $line);
                                        }
+                               }
 
-                                       $reply['content'] .= "<img src=\"".theme_image($link, 'images/art-share.png')."\"
+                               $rv['content'] .= "<img src=\"".theme_image($link, 'images/digest_checkbox.png')."\"
                                                class='tagsPic' style=\"cursor : pointer\"
-                                               onclick=\"shareArticle(".$line['int_id'].")\"
-                                               alt='Zoom' title='".__('Share by URL')."'>";
-
-                                       $reply['content'] .= "<img src=\"images/digest_checkbox.png\"
-                                               style=\"cursor : pointer\" style=\"cursor : pointer\"
-                                               onclick=\"dismissArticle($id)\"
-                                               alt='Dismiss' title='".__('Dismiss article')."'>";
-
-                                       $reply['content'] .= "</div>";
-                                       $reply['content'] .= "</div>";
-
-                                       $reply['content'] .= "</div>";
-
-                                       $reply['content'] .= "</div>";
-
-                               }
+                                               onclick=\"closeArticlePanel($id)\"
+                                               title='".__('Close article')."'>";
 
-                               ++$lnum;
+                       } else {
+                               $tags_str = strip_tags($tags_str);
+                               $rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>";
                        }
+                       $rv['content'] .= "</div>";
+                       $rv['content'] .= "<div clear='both'>$entry_comments</div>";
 
-                       if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PE", $timing_info);
-
-               } else {
-                       $message = "";
+                       if ($line["orig_feed_id"]) {
 
-                       switch ($view_mode) {
-                               case "unread":
-                                       $message = __("No unread articles found to display.");
-                                       break;
-                               case "updated":
-                                       $message = __("No updated articles found to display.");
-                                       break;
-                               case "marked":
-                                       $message = __("No starred articles found to display.");
-                                       break;
-                               default:
-                                       if ($feed < -10) {
-                                               $message = __("No articles found to display. You can assign articles to labels manually (see the Actions menu above) or use a filter.");
-                                       } else {
-                                               $message = __("No articles found to display.");
-                                       }
-                       }
+                               $tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds
+                                       WHERE id = ".$line["orig_feed_id"]);
 
-                       if (!$offset && $message) {
-                               $reply['content'] .= "<div class='whiteBox'>$message";
+                               if (db_num_rows($tmp_result) != 0) {
 
-                               $reply['content'] .= "<p class=\"small\"><span class=\"insensitive\">";
+                                       $rv['content'] .= "<div clear='both'>";
+                                       $rv['content'] .= __("Originally from:");
 
-                               $result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
-                                       WHERE owner_uid = " . $_SESSION['uid']);
+                                       $rv['content'] .= "&nbsp;";
 
-                               $last_updated = db_fetch_result($result, 0, "last_updated");
-                               $last_updated = make_local_datetime($link, $last_updated, false);
+                                       $tmp_line = db_fetch_assoc($tmp_result);
 
-                               $reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
+                                       $rv['content'] .= "<a target='_blank'
+                                               href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
+                                               $tmp_line['title'] . "</a>";
 
-                               $result = db_query($link, "SELECT COUNT(id) AS num_errors
-                                       FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
+                                       $rv['content'] .= "&nbsp;";
 
-                               $num_errors = db_fetch_result($result, 0, "num_errors");
+                                       $rv['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
+                                       $rv['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.png'></a>";
 
-                               if ($num_errors > 0) {
-                                       $reply['content'] .= "<br/>";
-                                       $reply['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
-                                               __('Some feeds have update errors (click for details)')."</a>";
+                                       $rv['content'] .= "</div>";
                                }
-                               $reply['content'] .= "</span></p></div>";
                        }
-               }
-
-               if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H2", $timing_info);
-
-               return array($topmost_article_ids, $headlines_count, $feed, $disable_cache,
-                       $vgroup_last_feed, $reply);
-       }
-
-// from here: http://www.roscripts.com/Create_tag_cloud-71.html
 
-       function printTagCloud($link) {
+                       $rv['content'] .= "</div>";
 
-               $query = "SELECT tag_name, COUNT(post_int_id) AS count
-                       FROM ttrss_tags WHERE owner_uid = ".$_SESSION["uid"]."
-                       GROUP BY tag_name ORDER BY count DESC LIMIT 50";
+                       $rv['content'] .= "<div id=\"POSTNOTE-$id\">";
+                               if ($line['note']) {
+                                       $rv['content'] .= format_article_note($id, $line['note']);
+                               }
+                       $rv['content'] .= "</div>";
 
-               $result = db_query($link, $query);
+                       $rv['content'] .= "<div class=\"postIcon\">" .
+                               "<a target=\"_blank\" title=\"".__("Visit the website")."\"$
+                               href=\"".htmlspecialchars($feed_site_url)."\">".
+                               $feed_icon . "</a></div>";
 
-               $tags = array();
+                       $rv['content'] .= "<div class=\"postContent\">";
 
-               while ($line = db_fetch_assoc($result)) {
-                       $tags[$line["tag_name"]] = $line["count"];
-               }
+                       $article_content = sanitize($link, $line["content"], false, false,
+                               $feed_site_url);
 
-        if( count($tags) == 0 ){ return; }
+                       $rv['content'] .= $article_content;
 
-               ksort($tags);
+                       $rv['content'] .= format_article_enclosures($link, $id,
+                               $always_display_enclosures, $article_content);
 
-               $max_size = 32; // max font size in pixels
-               $min_size = 11; // min font size in pixels
+                       $rv['content'] .= "</div>";
 
-               // largest and smallest array values
-               $max_qty = max(array_values($tags));
-               $min_qty = min(array_values($tags));
+                       $rv['content'] .= "</div>";
 
-               // find the range of values
-               $spread = $max_qty - $min_qty;
-               if ($spread == 0) { // we don't want to divide by zero
-                               $spread = 1;
                }
 
-               // set the font-size increment
-               $step = ($max_size - $min_size) / ($spread);
-
-               // loop through the tag array
-               foreach ($tags as $key => $value) {
-                       // calculate font-size
-                       // find the $value in excess of $min_qty
-                       // multiply by the font-size increment ($size)
-                       // and add the $min_size set above
-                       $size = round($min_size + (($value - $min_qty) * $step));
+               if ($zoom_mode) {
+                       $rv['content'] .= "
+                               <div style=\"text-align : center\">
+                               <button onclick=\"return window.close()\">".
+                                       __("Close this window")."</button></div>";
+                       $rv['content'] .= "</body></html>";
+               }
 
-                       $key_escaped = str_replace("'", "\\'", $key);
+               return $rv;
 
-                       echo "<a href=\"javascript:viewfeed('$key_escaped') \" style=\"font-size: " .
-                               $size . "px\" title=\"$value articles tagged with " .
-                               $key . '">' . $key . '</a> ';
-               }
        }
 
        function print_checkpoint($n, $s) {
                }
        } // function encrypt_password
 
-       /**
-        * Update a feed batch.
-        * Used by daemons to update n feeds by run.
-        * Only update feed needing a update, and not being processed
-        * by another process.
-        *
-        * @param mixed $link Database link
-        * @param integer $limit Maximum number of feeds in update batch. Default to DAEMON_FEED_LIMIT.
-        * @param boolean $from_http Set to true if you call this function from http to disable cli specific code.
-        * @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) {
-               // Process all other feeds using last_updated and interval parameters
-
-               // Test if the user has loggued in recently. If not, it does not update its feeds.
-               if (DAEMON_UPDATE_LOGIN_LIMIT > 0) {
-                       if (DB_TYPE == "pgsql") {
-                               $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
-                       } else {
-                               $login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
-                       }
-               } else {
-                       $login_thresh_qpart = "";
-               }
-
-               // Test if the feed need a update (update interval exceded).
-               if (DB_TYPE == "pgsql") {
-                       $update_limit_qpart = "AND ((
-                                       ttrss_feeds.update_interval = 0
-                                       AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
-                               ) OR (
-                                       ttrss_feeds.update_interval > 0
-                                       AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
-                               ) OR ttrss_feeds.last_updated IS NULL)";
-               } else {
-                       $update_limit_qpart = "AND ((
-                                       ttrss_feeds.update_interval = 0
-                                       AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
-                               ) OR (
-                                       ttrss_feeds.update_interval > 0
-                                       AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
-                               ) OR ttrss_feeds.last_updated IS NULL)";
-               }
-
-               // 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')";
-               } else {
-                       $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))";
-               }
-
-               // Test if there is a limit to number of updated feeds
-               $query_limit = "";
-               if($limit) $query_limit = sprintf("LIMIT %d", $limit);
-
-               $random_qpart = sql_random_function();
-
-               // We search for feed needing update.
-               $result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid,
-                               ".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
-                               ttrss_feeds.update_interval
-                       FROM
-                               ttrss_feeds, ttrss_users, ttrss_user_prefs
-                       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'
-                               $login_thresh_qpart $update_limit_qpart
-                        $updstart_thresh_qpart
-                       ORDER BY $random_qpart $query_limit");
-
-               $user_prefs_cache = array();
-
-               if($debug) _debug(sprintf("Scheduled %d feeds to update...\n", db_num_rows($result)));
-
-               // 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)) {
-                       $feeds_to_update[$line['id']] = $line;
-               }
-
-               // We update the feed last update started date before anything else.
-               // There is no lag due to feed contents downloads
-               // It prevent an other process to update the same feed.
-               $feed_ids = array_keys($feeds_to_update);
-               if($feed_ids) {
-                       db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
-                               WHERE id IN (%s)", implode(',', $feed_ids)));
-               }
-
-               // For each feed, we call the feed update function.
-               while ($line = array_pop($feeds_to_update)) {
-
-                       if($debug) _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
-
-                       update_rss_feed($link, $line["id"], true);
-
-                       sleep(1); // prevent flood (FIXME make this an option?)
-               }
-
-               // Send feed digests by email if needed.
-               if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
-
-       } // function update_daemon_common
 
        function sanitize_article_content($text) {
                # we don't support CDATA sections in articles, they break our own escaping
                                inverse,
                                action_param,
                                filter_param
-                               FROM ttrss_filters,ttrss_filter_types,ttrss_filter_actions WHERE
+                               FROM ttrss_filters
+                                       LEFT JOIN ttrss_feeds ON (ttrss_feeds.id = '$feed'),
+                                       ttrss_filter_types,ttrss_filter_actions
+                               WHERE
                                        enabled = true AND
                                        $ftype_query_part
-                                       owner_uid = $owner_uid AND
+                                       ttrss_filters.owner_uid = $owner_uid AND
                                        ttrss_filter_types.id = filter_type AND
                                        ttrss_filter_actions.id = action_id AND
-                                       (feed_id IS NULL OR feed_id = '$feed') ORDER BY reg_exp");
+                                       ((cat_filter = true AND ttrss_feeds.cat_id = ttrss_filters.cat_id) OR
+                                       (cat_filter = true AND ttrss_feeds.cat_id IS NULL AND
+                                               ttrss_filters.cat_id IS NULL) OR
+                                       (cat_filter = false AND (feed_id IS NULL OR feed_id = '$feed')))
+                               ORDER BY reg_exp");
 
                        while ($line = db_fetch_assoc($result)) {
+
                                if (!$filters[$line["name"]]) $filters[$line["name"]] = array();
                                        $filter["reg_exp"] = $line["reg_exp"];
                                        $filter["action"] = $line["action"];
                }
        }
 
-       function update_feedbrowser_cache($link) {
-
-               $result = db_query($link, "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($link, "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"]);
-
-                       $tmp_result = db_query($link, "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
-                                       (feed_url, site_url, title, subscribers) VALUES ('$feed_url',
-                                               '$site_url', '$title', '$subscribers')");
-
-                               ++$count;
-
-                       }
-
-               }
-
-               db_query($link, "COMMIT");
-
-               return $count;
-
-       }
-
        /* function ccache_zero($link, $feed_id, $owner_uid) {
                db_query($link, "UPDATE ttrss_counters_cache SET
                        value = 0, updated = NOW() WHERE
                db_query($link, "COMMIT");
        }
 
-       function label_create($link, $caption) {
+       function label_create($link, $caption, $fg_color = '', $bg_color = '') {
 
                db_query($link, "BEGIN");
 
 
                if (db_num_rows($result) == 0) {
                        $result = db_query($link,
-                               "INSERT INTO ttrss_labels2 (caption,owner_uid)
-                                       VALUES ('$caption', '".$_SESSION["uid"]."')");
+                               "INSERT INTO ttrss_labels2 (caption,owner_uid,fg_color,bg_color)
+                                       VALUES ('$caption', '".$_SESSION["uid"]."', '$fg_color', '$bg_color')");
 
                        $result = db_affected_rows($link, $result) != 0;
                }
                return $tags_deleted;
        }
 
-       function feedlist_init_cat($link, $cat_id, $hidden = false) {
-               $obj = array();
-               $cat_id = (int) $cat_id;
-
-               if ($cat_id > 0) {
-                       $cat_unread = ccache_find($link, $cat_id, $_SESSION["uid"], true);
-               } else if ($cat_id == 0 || $cat_id == -2) {
-                       $cat_unread = getCategoryUnread($link, $cat_id);
-               }
-
-               $obj['id'] = 'CAT:' . $cat_id;
-               $obj['items'] = array();
-               $obj['name'] = getCategoryTitle($link, $cat_id);
-               $obj['type'] = 'feed';
-               $obj['unread'] = (int) $cat_unread;
-               $obj['hidden'] = $hidden;
-               $obj['bare_id'] = $cat_id;
-
-               return $obj;
-       }
-
-       function feedlist_init_feed($link, $feed_id, $title = false, $unread = false, $error = '', $updated = '') {
-               $obj = array();
-               $feed_id = (int) $feed_id;
-
-               if (!$title)
-                       $title = getFeedTitle($link, $feed_id, false);
-
-               if ($unread === false)
-                       $unread = getFeedUnread($link, $feed_id, false);
-
-               $obj['id'] = 'FEED:' . $feed_id;
-               $obj['name'] = $title;
-               $obj['unread'] = (int) $unread;
-               $obj['type'] = 'feed';
-               $obj['error'] = $error;
-               $obj['updated'] = $updated;
-               $obj['icon'] = getFeedIcon($feed_id);
-               $obj['bare_id'] = $feed_id;
-
-               return $obj;
-       }
-
-
-       function fetch_twitter_rss($link, $url, $owner_uid) {
-
-               require_once 'lib/tmhoauth/tmhOAuth.php';
-
-               $result = db_query($link, "SELECT twitter_oauth FROM ttrss_users
-                       WHERE id = $owner_uid");
-
-               $access_token = json_decode(db_fetch_result($result, 0, 'twitter_oauth'), true);
-               $url_escaped = db_escape_string($url);
-
-               if ($access_token) {
-
-                       $tmhOAuth = new tmhOAuth(array(
-                               'consumer_key'    => CONSUMER_KEY,
-                               'consumer_secret' => CONSUMER_SECRET,
-                               'user_token' => $access_token['oauth_token'],
-                               'user_secret' => $access_token['oauth_token_secret'],
-                       ));
-
-                       $code = $tmhOAuth->request('GET', $url);
-
-                       if ($code == 200) {
-
-                               $content = $tmhOAuth->response['response'];
-
-                               define('MAGPIE_CACHE_ON', false);
-
-                               $rss = new MagpieRSS($content, MAGPIE_OUTPUT_ENCODING,
-                                       MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
-
-                               return $rss;
-
-                       } else {
-
-                               db_query($link, "UPDATE ttrss_feeds
-                                       SET last_error = 'OAuth authorization failed ($code).'
-                                       WHERE feed_url = '$url_escaped' AND owner_uid = $owner_uid");
-                       }
-
-               } else {
-
-                       db_query($link, "UPDATE ttrss_feeds
-                               SET last_error = 'OAuth information not found.'
-                               WHERE feed_url = '$url_escaped' AND owner_uid = $owner_uid");
-
-                       return false;
-               }
-       }
-
        function print_user_stylesheet($link) {
                $value = get_pref($link, 'USER_STYLESHEET');