]> git.wh0rd.org - tt-rss.git/blobdiff - functions.php
daemon2: check proper lockfile location in reap_children()
[tt-rss.git] / functions.php
index 6a18ffbf3b6f9098528074b8836950771995ce55..e18b023533da1ad177333f93beaae2ecaac189b3 100644 (file)
@@ -1,10 +1,8 @@
 <?php
 
-/*     if ($_REQUEST["debug"]) {
+       if ($_REQUEST["debug"]) {
                define('DEFAULT_ERROR_LEVEL', E_ALL);
-       } else {
-               define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
-       } */
+       }
 
        require_once 'config.php';
 
                if (DB_TYPE == "pgsql") {
 /*                     $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
                                marked = false AND feed_id = '$feed_id' AND
-                               (SELECT date_entered FROM ttrss_entries WHERE
+                               (SELECT date_updated FROM ttrss_entries WHERE
                                        id = ref_id) < NOW() - INTERVAL '$purge_interval days'"); */
 
                        $pg_version = get_pgsql_version($link);
                                        marked = false AND 
                                        feed_id = '$feed_id' AND 
                                        $query_limit
-                                       ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
+                                       ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'");
 
                        } else {
 
                                        marked = false AND 
                                        feed_id = '$feed_id' AND 
                                        $query_limit
-                                       ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
+                                       ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'");
                        }
 
                        $rows = pg_affected_rows($result);
                
 /*                     $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
                                marked = false AND feed_id = '$feed_id' AND
-                               (SELECT date_entered FROM ttrss_entries WHERE 
+                               (SELECT date_updated FROM ttrss_entries WHERE 
                                        id = ref_id) < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */
 
                        $result = db_query($link, "DELETE FROM ttrss_user_entries 
                                marked = false AND 
                                feed_id = '$feed_id' AND 
                                $query_limit
-                               ttrss_entries.date_entered < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)");
+                               ttrss_entries.date_updated < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)");
                                        
                        $rows = mysql_affected_rows($link);
 
        } // function purge_feed
 
        /**
-        * Purge old posts from old feeds.
+        * Purge old posts from old feeds. Not used anymore, purging is done after feed update.
         * 
         * @param mixed $link A database connection
         * @param boolean $do_output Set to true to enable printed output, false by default.
         * @access public
         * @return void
         */
-       function global_purge_old_posts($link, $do_output = false, $limit = false) {
+       /* function global_purge_old_posts($link, $do_output = false, $limit = false) {
 
                $random_qpart = sql_random_function();
 
                        }
                }       
 
-               // purge orphaned posts in main content table
-               $result = db_query($link, "DELETE FROM ttrss_entries WHERE 
-                       (SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
+               purge_orphans($link, $do_output);
 
-               if ($do_output) {
-                       $rows = db_affected_rows($link, $result);
-                       _debug("Purged $rows orphaned posts.");
-               }
-
-       } // function global_purge_old_posts
+       } // function global_purge_old_posts */
 
        function feed_purge_interval($link, $feed_id) {
 
                purge_orphans($link);
        }
 
-       function purge_orphans($link) {
+       function purge_orphans($link, $do_output = false) {
+
                // purge orphaned posts in main content table
-               db_query($link, "DELETE FROM ttrss_entries WHERE 
+               $result = db_query($link, "DELETE FROM ttrss_entries WHERE 
                        (SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
+
+               if ($do_output) {
+                       $rows = db_affected_rows($link, $result);
+                       _debug("Purged $rows orphaned posts.");
+               }
        }
 
        function get_feed_update_interval($link, $feed_id) {
                }
        }
 
-       function fetch_file_contents($url) {
+       function fetch_file_contents($url, $type) {
                if (USE_CURL_FOR_ICONS) {
-                       $tmpfile = tempnam(TMP_DIRECTORY, "ttrss-tmp");
-
                        $ch = curl_init($url);
-                       $fp = fopen($tmpfile, "w");
 
-                       if ($fp) {
-                               curl_setopt($ch, CURLOPT_FILE, $fp);
-                               curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
-                               curl_setopt($ch, CURLOPT_TIMEOUT, 45);
-                               curl_exec($ch);
-
-                               if (strpos(curl_getinfo($ch, CURLINFO_CONTENT_TYPE), "image/") !== false) {
-                                       curl_close($ch);
-                                       fclose($fp);                                    
-                                       $contents = file_get_contents($tmpfile);
-                               } else {
-                                       curl_close($ch);
-                                       fclose($fp);                                    
-                               }
+                       curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
+                       curl_setopt($ch, CURLOPT_TIMEOUT, 45);
+                       curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+                       curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
+                       curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
+                       curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+                       $contents = curl_exec($ch);
+                       if ($contents === false) {
+                               curl_close($ch);
+                               return false;
                        }
 
-                       unlink($tmpfile);
+                       $content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+                       curl_close($ch);
 
-                       return $contents;
+                       if ($type && strpos($content_type, "$type") === false) {
+                               return false;
+                       }
 
+                       return $contents;
                } else {
                        return file_get_contents($url);
                }
                $icon_file = ICONS_DIR . "/$feed.ico";
 
                if ($favicon_url && !file_exists($icon_file)) {
-                       $contents = fetch_file_contents($favicon_url);
+                       $contents = fetch_file_contents($favicon_url, "image");
 
-                       $fp = fopen($icon_file, "w");
+                       if ($contents) {
+                               $fp = fopen($icon_file, "w");
 
-                       if ($fp) {
-                               fwrite($fp, $contents);
-                               fclose($fp);
-                               chmod($icon_file, 0644);
+                               if ($fp) {
+                                       fwrite($fp, $contents);
+                                       fclose($fp);
+                                       chmod($icon_file, 0644);
+                               }
                        }
                }
 
                $auth_login = db_fetch_result($result, 0, "auth_login");
                $auth_pass = db_fetch_result($result, 0, "auth_pass");
 
-               if (ALLOW_SELECT_UPDATE_METHOD) {
-                       if (ENABLE_SIMPLEPIE) {
-                               $use_simplepie = $update_method != 1;
-                       } else {
-                               $use_simplepie = $update_method == 2;
-                       }
+               if (DEFAULT_UPDATE_METHOD == "1") {
+                       $use_simplepie = $update_method != 1;
                } else {
-                       $use_simplepie = ENABLE_SIMPLEPIE;
+                       $use_simplepie = $update_method == 2;
                }
 
                if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
                        error_reporting(0);
                }
 
-               $obj_id = md5("FDATA:$fetch_url");
+               $obj_id = md5("FDATA:$use_simplepie:$fetch_url");
 
                if ($memcache && $obj = $memcache->get($obj_id)) {
 
                                        $rss_1_date = $item['dc']['date'];
                                        $atom_date = $item['issued'];
                                        if (!$atom_date) $atom_date = $item['updated'];
-                       
+
                                        if ($atom_date != "") $entry_timestamp = parse_w3cdtf($atom_date);
                                        if ($rss_1_date != "") $entry_timestamp = parse_w3cdtf($rss_1_date);
                                        if ($rss_2_date != "") $entry_timestamp = strtotime($rss_2_date);
+
                                }
 
                                if ($entry_timestamp == "" || $entry_timestamp == -1 || !$entry_timestamp) {
                                                        content,
                                                        content_hash,
                                                        no_orig_date,
+                                                       date_updated,
                                                        date_entered,
                                                        comments,
                                                        num_comments,
                                                        '$entry_content', 
                                                        '$content_hash',
                                                        $no_orig_date, 
-                                                       NOW(), 
+                                                       NOW(),
+                                                       NOW(),
                                                        '$entry_comments',
                                                        '$num_comments',
                                                        '$entry_author')");
                                } else {
                                        // we keep encountering the entry in feeds, so we need to
-                                       // update date_entered column so that we don't get horrible
+                                       // 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
 
                                        $base_entry_id = db_fetch_result($result, 0, "id");
 
-                                       db_query($link, "UPDATE ttrss_entries SET date_entered = NOW()
+                                       db_query($link, "UPDATE ttrss_entries SET date_updated = NOW()
                                                WHERE id = '$base_entry_id'");
                                }
 
 
                                $result = db_query($link, "SELECT 
                                                id,content_hash,no_orig_date,title,
-                                               ".SUBSTRING_FOR_DATE."(date_entered,1,19) as date_entered,
+                                               ".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated,
                                                ".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
                                                num_comments
                                        FROM 
                                        $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_entered = strtotime(db_fetch_result($result, 
-                                               0, "date_entered"));
+                                       $orig_date_updated = strtotime(db_fetch_result($result, 
+                                               0, "date_updated"));
 
                                        $ref_id = db_fetch_result($result, 0, "id");
                                        $entry_ref_id = $ref_id;
 //                                     error_reporting(0);
 
                                        $article_filters = get_article_filters($filters, $entry_title, 
-                                                       $entry_content, $entry_link, $entry_timestamp);
+                                                       $entry_content, $entry_link, $entry_timestamp, $entry_author);
 
                                        if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
                                                _debug("update_rss_feed: article filters: ");
 
                                # check for manual tags
 
-                               $tag_filter = find_article_filter($article_filters, "tag"); 
+                               foreach ($article_filters as $f) {
+                                       if ($f[0] == "tag") {
 
-                               if ($tag_filter) {
+                                               $manual_tags = trim_array(split(",", $f[1]));
 
-                                       $manual_tags = trim_array(split(",", $tag_filter[1]));
-
-                                       foreach ($manual_tags as $tag) {
-                                               if (tag_is_valid($tag)) {
-                                                       array_push($entry_tags, $tag);
+                                               foreach ($manual_tags as $tag) {
+                                                       if (tag_is_valid($tag)) {
+                                                               array_push($entry_tags, $tag);
+                                                       }
                                                }
                                        }
                                }
                print "</select>";
        }
 
-       function get_article_filters($filters, $title, $content, $link, $timestamp) {
+       function get_article_filters($filters, $title, $content, $link, $timestamp, $author) {
                $matches = array();
 
                if ($filters["title"]) {
                        }
                } 
 
+               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))) {
+
+                                       array_push($matches, array($filter["action"], $filter["action_param"]));
+                               }
+                       }
+               }
+
                return $matches;
        }
 
                        $link_title = "Updated: $last_updated";
                }
 
-               $feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\" 
-                       href=\"javascript:viewfeed('$feed_id', '', false, '', false, 0);\">$feed_title</a>";
+               $feed = "<span class='feedlink' title=\"$link_title\" id=\"FEEDL-$feed_id\" href=\"#\"
+                       onclick=\"viewfeed('$feed_id');\">$feed_title</span>";
 
 /*             if ($feed_id < -10) {
                        $bg_color = "#00ccff";
        
                                $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
                                $_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
+
+                               $_SESSION["last_version_check"] = time();
        
                                initialize_user_prefs($link, $_SESSION["uid"]);
        
 
        function get_user_theme($link) {
 
-               if (get_schema_version($link) >= 63) {
+               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 get_user_theme_path($link) {
 
-               if (get_schema_version($link) >= 63) {
+               if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
                        $theme_name = get_pref($link, "_THEME_ID");
 
                        if ($theme_name && is_dir("themes/$theme_name")) {
        function make_lockfile($filename) {
                $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
 
-               if (flock($fp, LOCK_EX | LOCK_NB)) {            
+               if (flock($fp, LOCK_EX | LOCK_NB)) {
+                       if (function_exists('posix_getpid')) {
+                               fwrite($fp, posix_getpid() . "\n");
+                       }
                        return $fp;
                } else {
                        return false;
 
        function getMaxAgeSubquery($days = COUNTERS_MAX_AGE) {
                if (DB_TYPE == "pgsql") {
-                       return "ttrss_entries.date_entered > 
+                       return "ttrss_entries.date_updated > 
                                NOW() - INTERVAL '$days days'";
                } else {
-                       return "ttrss_entries.date_entered > 
+                       return "ttrss_entries.date_updated > 
                                DATE_SUB(NOW(), INTERVAL $days DAY)";
                }
        }
                        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
                print "<param key=\"cdm_auto_catchup\" value=\"" . 
                        (int) get_pref($link, "CDM_AUTO_CATCHUP") . "\"/>";
 
+               print "<param key=\"fresh_article_max_age\" value=\"" . 
+                       (int) get_pref($link, "FRESH_ARTICLE_MAX_AGE") . "\"/>";
+
                print "<param key=\"icons_url\" value=\"" . ICONS_URL . "\"/>";
 
                print "<param key=\"cookie_lifetime\" value=\"" . SESSION_COOKIE_LIFETIME . "\"/>";
                                                $query_strategy_part = "feed_id = '$feed'";
                                        }
                                }
-                       } else if ($feed == 0) { // starred virtual 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,";
                        }
 
                        if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
-                               $order_by = "updated";
+                               $order_by = "date_entered";
                        } else {        
-                               $order_by = "updated DESC";
+                               $order_by = "date_entered DESC";
                        }
 
                        if ($view_mode != "noscores") {
                                }
 
                                $query = "SELECT DISTINCT 
+                                               date_entered,
                                                guid,
                                                ttrss_entries.id,ttrss_entries.title,
                                                updated,
                if (!$limit) $limit = 30;
 
                $qfh_ret = queryFeedHeadlines($link, $feed, 
-                       $limit, false, $is_cat, $search, $search_mode, $match_on, "updated DESC", 0,
+                       $limit, false, $is_cat, $search, $search_mode, $match_on, "date_updated DESC", 0,
                        $owner_uid);
 
                $result = $qfh_ret[0];
 
                        $rfc822_date = date('r', strtotime($line["updated"]));
   
-                       print "<pubDate>$rfc822_date</pubDate>";
+                       print "<pubDate>$rfc822_date</pubDate>";
+
+                       if ($line["author"]) {
+                               print "<author>" . htmlspecialchars($line["author"]) . "</author>";
+                       }
  
                        print "<title>" . 
                                htmlspecialchars($line["title"]) . "</title>";
                $affected_ids = array();
 
                if (DB_TYPE == "pgsql") {
-                       $interval_query = "ttrss_entries.date_entered > NOW() - INTERVAL '$days days'";
+                       $interval_query = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
                } else if (DB_TYPE == "mysql") {
-                       $interval_query = "ttrss_entries.date_entered > DATE_SUB(NOW(), INTERVAL $days DAY)";
+                       $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_entered,
+                               date_updated,
                                ttrss_user_entries.ref_id,
                                link,
                                SUBSTRING(content, 1, 120) AS excerpt,
                                AND $interval_query
                                AND ttrss_user_entries.owner_uid = $user_id
                                AND unread = true 
-                       ORDER BY ttrss_feeds.title, date_entered DESC
+                       ORDER BY ttrss_feeds.title, date_updated DESC
                        LIMIT $limit");
 
                $cur_feed_title = "";
                }
 
                error_reporting(0);
-               if (ENABLE_SIMPLEPIE) {
+               if (DEFAULT_UPDATE_METHOD == "1") {
                        $rss = new SimplePie();
                        $rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
 //                     $rss->set_timeout(MAGPIE_FETCH_TIME_OUT);
 
                if ($rss) {
 
-                       if (ENABLE_SIMPLEPIE) {
+                       if (DEFAULT_UPDATE_METHOD == "1") {
                                $items = $rss->get_items();
                        } else {
                                $items = $rss->items;
 
                        $latest_item = $items[0];
 
-                       if (ENABLE_SIMPLEPIE) {
+                       if (DEFAULT_UPDATE_METHOD == "1") {
                                $last_title = $latest_item->get_title();
                        } else {
                                $last_title = $latest_item["title"];
 
                        $latest_version = trim(preg_replace("/(Milestone)|(completed)/", "", $last_title));
 
-                       if (ENABLE_SIMPLEPIE) {
+                       if (DEFAULT_UPDATE_METHOD == "1") {
                                $release_url = sanitize_rss($link, $latest_item->get_link());
                                $content = sanitize_rss($link, $latest_item->get_description());
                        } else {
        function catchupArticlesById($link, $ids, $cmode, $owner_uid = false) {
 
                if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+               if (count($ids) == 0) return;
 
                $tmp_ids = array();
 
                                print "<div class=\"postEnclosures\">";
 
                                if (!get_pref($link, "STRIP_IMAGES")) {
-                                       if ($always_display_enclosures || !preg_match("/<img/i", $article_content)) {
+                                       if ($always_display_enclosures ||
+                                                               !preg_match("/<img/i", $article_content)) {
+                                                                       
                                                foreach ($entries as $entry) {
-                                                       if (preg_match("/image/", $entry["type"])) {
-                                                               print "<p><img 
+
+                                                       if (preg_match("/image/", $entry["type"]) ||
+                                                                       preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
+
+                                                                       print "<p><img
                                                                        alt=\"".htmlspecialchars($entry["filename"])."\"
-                                                                       src=\"" .htmlspecialchars($entry["url"]) . "\"></p>";
+                                                                       src=\"" .htmlspecialchars($entry["url"]) . "\"/></p>";
                                                        }
                                                }
                                        }
                                }
 
-                               print "<div class=\"postEnclosures\">";
-
                                if (db_num_rows($result) == 1) {
                                        print __("Attachment:") . " ";
                                } else {
                                }
 
                                $tmp_result = db_query($link, "SELECT always_display_enclosures FROM
-                                       ttrss_feeds WHERE id = ".$line['feed_id']." AND owner_uid = ".$_SESSION["uid"]);
+                                       ttrss_feeds WHERE id = ".
+                                               (($line['feed_id'] == null) ? $line['orig_feed_id'] : 
+                                                               $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]);
 
                                $always_display_enclosures = db_fetch_result($tmp_result, 0, "always_display_enclosures");
 
                                if (!get_pref($link, "STRIP_IMAGES")) {
-                                       if ($always_display_enclosures || !preg_match("/img/i", $article_content)) {
+                                       if ($always_display_enclosures || 
+                                                                       !preg_match("/img/i", $article_content)) {
+
                                                foreach ($entries as $entry) {
-                                                       if (preg_match("/image/", $entry["type"])) {
+                                                       if (preg_match("/image/", $entry["type"]) || 
+                                                               preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
                                                                print "<p><img 
                                                                        alt=\"".htmlspecialchars($entry["filename"])."\"
                                                                        src=\"" .htmlspecialchars($entry["url"]) . "\"></p>";
 
                return $url_path;
        }
+        function opml_publish_url($link){
+               $url_path = "";
+               
+
+               if ($_SERVER['HTTPS'] != "on") {
+                       $url_path = "http://";
+               } else {
+                       $url_path = "https://";
+               }
+
+               $url_path .= $_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
+               $url_path .= "/opml.php?op=publish&key=" . 
+                       get_pref($link, "_PREFS_PUBLISH_KEY", $_SESSION["uid"]);
+
+               return $url_path;
+       }
 
        /**
         * Purge a feed contents, marked articles excepted.
 
                        if($debug) _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
 
-                       // We setup a alarm to alert if the feed take more than 300s to update.
-                       // => HANG alarm.
-                       if(!$from_http && function_exists('pcntl_alarm')) pcntl_alarm(300);
                        update_rss_feed($link, $line["id"], true);
-                       // Cancel the alarm (the update went well)
-                       if(!$from_http && function_exists('pcntl_alarm')) pcntl_alarm(0);
 
                        sleep(1); // prevent flood (FIXME make this an option?)
                }
                return $rv;
        }
 
+       function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset) {
+
+                       $feeds = array();
+
+                       /* Labels */
+
+                       if (!$cat_id || $cat_id == -2) {
+                               $counters = getLabelCounters($link, true);
+
+                               foreach (array_keys($counters) as $id) {
+
+                                       $unread = $counters[$id]["counter"];
+       
+                                       if ($unread || !$unread_only) {
+       
+                                               $row = array(
+                                                               "id" => $id,
+                                                               "title" => $counters[$id]["description"],
+                                                               "unread" => $counters[$id]["counter"],
+                                                               "cat_id" => -2,
+                                                       );
+       
+                                               array_push($feeds, $row);
+                                       }
+                               }
+                       }
+
+                       /* Virtual feeds */
+
+                       if (!$cat_id || $cat_id == -1) {
+                               foreach (array(-1, -2, -3, -4, 0) as $i) {
+                                       $unread = getFeedUnread($link, $i);
+
+                                       if ($unread || !$unread_only) {
+                                               $title = getFeedTitle($link, $i);
+
+                                               $row = array(
+                                                               "id" => $i,
+                                                               "title" => $title,
+                                                               "unread" => $unread,
+                                                               "cat_id" => -1,
+                                                       );
+                                               array_push($feeds, $row);
+                                       }
+
+                               }                       
+                       }
+
+                       /* Real feeds */
+
+                       if ($limit) {
+                               $limit_qpart = "LIMIT $limit OFFSET $offset";
+                       } else {
+                               $limit_qpart = "";
+                       }
+
+                       if (!$cat_id) {
+                               $result = db_query($link, "SELECT 
+                                       id, feed_url, cat_id, title, ".
+                                               SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+                                               FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . 
+                                               " ORDER BY cat_id, title " . $limit_qpart);
+                       } else {
+                               $result = db_query($link, "SELECT 
+                                       id, feed_url, cat_id, title, ".
+                                               SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+                                               FROM ttrss_feeds WHERE 
+                                               cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . 
+                                               " ORDER BY cat_id, title " . $limit_qpart);
+                       }
+
+                       while ($line = db_fetch_assoc($result)) {
+
+                               $unread = getFeedUnread($link, $line["id"]);
+
+                               $has_icon = feed_has_icon($line['id']);
+
+                               if ($unread || !$unread_only) {
+
+                                       $row = array(
+                                                       "feed_url" => $line["feed_url"],
+                                                       "title" => $line["title"],
+                                                       "id" => (int)$line["id"],
+                                                       "unread" => (int)$unread,
+                                                       "has_icon" => $has_icon,
+                                                       "cat_id" => (int)$line["cat_id"],
+                                                       "last_updated" => strtotime($line["last_updated"])
+                                               );
+       
+                                       array_push($feeds, $row);
+                               }
+                       }
+
+               return $feeds;
+       }
+
+       function api_get_headlines($link, $feed_id, $limit, $offset,
+                                       $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order) {
+
+                       /* do not rely on params below */
+
+                       $search = db_escape_string($_REQUEST["search"]);
+                       $search_mode = db_escape_string($_REQUEST["search_mode"]);
+                       $match_on = db_escape_string($_REQUEST["match_on"]);
+                       
+                       $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit, 
+                               $view_mode, $is_cat, $search, $search_mode, $match_on,
+                               $order, $offset);
+
+                       $result = $qfh_ret[0];
+                       $feed_title = $qfh_ret[1];
+
+                       $headlines = array();
+
+                       while ($line = db_fetch_assoc($result)) {
+                               $is_updated = ($line["last_read"] == "" && 
+                                       ($line["unread"] != "t" && $line["unread"] != "1"));
+
+                               $headline_row = array(
+                                               "id" => (int)$line["id"],
+                                               "unread" => sql_bool_to_bool($line["unread"]),
+                                               "marked" => sql_bool_to_bool($line["marked"]),
+                                               "published" => sql_bool_to_bool($line["published"]),
+                                               "updated" => strtotime($line["updated"]),
+                                               "is_updated" => $is_updated,
+                                               "title" => $line["title"],
+                                               "link" => $line["link"],
+                                               "feed_id" => $line["feed_id"],
+                                               "tags" => get_article_tags($link, $line["id"]),
+                                       );
+
+                               if ($show_excerpt) {
+                                       $excerpt = truncate_string(strip_tags($line["content_preview"]), 100);
+                                       $headline_row["excerpt"] = $excerpt;
+                               }
+
+                               if ($show_content) {
+                                       $headline_row["content"] = $line["content_preview"];
+                               }
+
+                               array_push($headlines, $headline_row);
+                       }
+
+                       return $headlines;
+       }
+
 ?>