Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss

diff --combined functions.php
index a669814dff0b4af71474b0ac2e0c145135fd419e,d628ec743e7a575fdc36512222b41457af8d20f0..21b9db8e7a6469333d562f4b0b8f19c2e129edb9
--- 1/functions.php
--- 2/functions.php
+++ b/functions.php
@@@ -3512,9 -3512,9 +3512,9 @@@
                        }
  
                        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") {
@@@ -3645,7 -3645,7 +3645,7 @@@
                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_entered DESC", 0,
                        $owner_uid);
  
                $result = $qfh_ret[0];
@@@ -5523,7 -5523,9 +5523,9 @@@
                                }
  
                                $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");
  
@@@ -6659,4 -6661,150 +6661,150 @@@
                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;
+       }
+ 
  ?>