add one catchall function to make uniqids/keyhashes/etc used by tt-rss

[tt-rss.git] / include / functions2.php

diff --git a/include/functions2.php b/include/functions2.php
index a85c49ccfc3ba6aee029271018fc701cfda6cb34..df876851761943fb48feace2af7bb88956ff1dfe 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -425,8 +425,6 @@
                return $rv;
        }
 
-       // $search_mode is obsolete/unused
-       //function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false, $check_top_id = false) {
        function queryFeedHeadlines($params) {
 
                $feed = $params["feed"];
@@ -437,7 +435,6 @@
                $override_order = isset($params["override_order"]) ? $params["override_order"] : false;
                $offset = isset($params["offset"]) ? $params["offset"] : 0;
                $owner_uid = isset($params["owner_uid"]) ? $params["owner_uid"] : $_SESSION["uid"];
-               $filter = isset($params["filter"]) ? $params["filter"] : 0;
                $since_id = isset($params["since_id"]) ? $params["since_id"] : 0;
                $include_children = isset($params["include_children"]) ? $params["include_children"] : false;
                $ignore_vfeed_group = isset($params["ignore_vfeed_group"]) ? $params["ignore_vfeed_group"] : false;
@@ -466,43 +463,6 @@
                                $search_query_part = "";
                        }
 
-                       if ($filter) {
-
-                               if (DB_TYPE == "pgsql") {
-                                       $query_strategy_part .= " AND updated > NOW() - INTERVAL '14 days' ";
-                               } else {
-                                       $query_strategy_part .= " AND updated > DATE_SUB(NOW(), INTERVAL 14 DAY) ";
-                               }
-
-                               $override_order = "updated DESC";
-
-                               $filter_query_part = filter_to_sql($filter, $owner_uid);
-
-                               // Try to check if SQL regexp implementation chokes on a valid regexp
-
-
-                               $result = db_query("SELECT true AS true_val
-                                        FROM ttrss_entries
-                                        JOIN ttrss_user_entries ON ttrss_entries.id = ttrss_user_entries.ref_id
-                                        JOIN ttrss_feeds ON ttrss_feeds.id = ttrss_user_entries.feed_id
-                                       WHERE $filter_query_part LIMIT 1", false);
-
-                               if ($result) {
-                                       $test = db_fetch_result($result, 0, "true_val");
-
-                                       if (!$test) {
-                                               $filter_query_part = "false AND";
-                                       } else {
-                                               $filter_query_part .= " AND";
-                                       }
-                               } else {
-                                       $filter_query_part = "false AND";
-                               }
-
-                       } else {
-                               $filter_query_part = "";
-                       }
-
                        if ($since_id) {
                                $since_id_part = "ttrss_entries.id > $since_id AND ";
                        } else {
@@ -729,15 +689,25 @@
                                        $start_ts_query_part = "";
                                }
 
-                               $first_id = false;
+                               $first_id = 0;
+                               $first_id_query_strategy_part = $query_strategy_part;
+
+                               if ($feed == -3)
+                                       $first_id_query_strategy_part = "true";
+
                                // if previous topmost article id changed that means our current pagination is no longer valid
                                $query = "SELECT DISTINCT
+                                               ttrss_feeds.title,
                                                date_entered,
                                                guid,
                                                ttrss_entries.id,
                                                ttrss_entries.title,
                                                updated,
-                                               score
+                                               score,
+                                               marked,
+                                               published,
+                                               last_marked,
+                                               last_published
                                        FROM
                                                $from_qpart
                                        WHERE
@@ -746,19 +716,18 @@
                                        ttrss_user_entries.owner_uid = '$owner_uid' AND
                                        $search_query_part
                                        $start_ts_query_part
-                                       $filter_query_part
                                        $since_id_part
-                                       $query_strategy_part ORDER BY $order_by LIMIT 1";
+                                       $first_id_query_strategy_part ORDER BY $order_by LIMIT 1";
 
                                        if ($_REQUEST["debug"]) {
                                                print $query;
                                        }
 
                                        $result = db_query($query);
-                                       if ($result) {
+                                       if ($result && db_num_rows($result) > 0) {
                                                $first_id = (int) db_fetch_result($result, 0, "id");
 
-                                               if ($offset > 0 && $check_first_id && $first_id != $check_first_id) {
+                                               if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) {
                                                        return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id);
                                                }
                                        }
@@ -792,7 +761,6 @@
                                        ttrss_user_entries.owner_uid = '$owner_uid' AND
                                        $search_query_part
                                        $start_ts_query_part
-                                       $filter_query_part
                                        $view_query_part
                                        $since_id_part
                                        $query_strategy_part ORDER BY $order_by
@@ -1473,7 +1441,7 @@
 
                $tag = mb_strtolower($tag, 'utf-8');
 
-               $tag = preg_replace('/[\'\"\+\>\<]/', "", $tag);
+               $tag = preg_replace('/[,\'\"\+\>\<]/', "", $tag);
 
                if (DB_TYPE == "mysql") {
                        $tag = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $tag);
@@ -1805,7 +1773,7 @@
                if (db_num_rows($result) == 1) {
                        return db_fetch_result($result, 0, "access_key");
                } else {
-                       $key = db_escape_string(uniqid(base_convert(rand(), 10, 36)));
+                       $key = db_escape_string(uniqid_short());
 
                        $result = db_query("INSERT INTO ttrss_access_keys
                                (access_key, feed_id, is_cat, owner_uid)