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"];
$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;
$override_strategy = isset($params["override_strategy"]) ? $params["override_strategy"] : false;
$override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false;
$start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false;
- $check_top_id = isset($params["check_top_id"]) ? $params["check_top_id"] : false;
+ $check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false;
$ext_tables_part = "";
+ $query_strategy_part = "";
+
$search_words = array();
if ($search) {
$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 {
$start_ts_query_part = "";
}
+ $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
- if ($check_top_id) {
- $query = "SELECT DISTINCT
- date_entered,
- guid,
- ttrss_entries.id,
- ttrss_entries.title,
- updated,
- 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
- $start_ts_query_part
- $filter_query_part
- $view_query_part
- $since_id_part
- $query_strategy_part ORDER BY $order_by LIMIT 1";
+ $query = "SELECT DISTINCT
+ ttrss_feeds.title,
+ date_entered,
+ guid,
+ ttrss_entries.id,
+ ttrss_entries.title,
+ updated,
+ score,
+ marked,
+ published,
+ last_marked,
+ last_published
+ 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
+ $start_ts_query_part
+ $since_id_part
+ $first_id_query_strategy_part ORDER BY $order_by LIMIT 1";
if ($_REQUEST["debug"]) {
print $query;
}
$result = db_query($query);
- if ($result) {
- $current_top_id = db_fetch_result($result, 0, "id");
+ if ($result && db_num_rows($result) > 0) {
+ $first_id = (int) db_fetch_result($result, 0, "id");
- if ($current_top_id != $check_top_id) {
- // top changed, bail out
-
- return array(false, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words);
+ 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);
}
}
- }
$query = "SELECT DISTINCT
date_entered,
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
$result = db_query($query);
}
- return array($result, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words);
+ return array($result, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id);
}
$_SESSION["hasMp3"])) {
$entry .= "<audio preload=\"none\" controls>
- <source type=\"$ctype\" src=\"$url\"></source>
+ <source type=\"$ctype\" src=\"$url\"/>
</audio>";
} else {
$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);
return __("no tags");
} else {
$maxtags = min(5, count($tags));
+ $tags_str = "";
for ($i = 0; $i < $maxtags; $i++) {
$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed('".$tags[$i]."')\">" . $tags[$i] . "</a>, ";
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)
git.wh0rd.org / tt-rss.git / blobdiff