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");
-
- if ($do_output) {
- $rows = db_affected_rows($link, $result);
- _debug("Purged $rows orphaned posts.");
- }
+ purge_orphans($link, $do_output);
- } // 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) {
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;
$_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 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];
$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 (DEFAULT_UPDATE_INTERVAL == "1") {
+ if (DEFAULT_UPDATE_METHOD == "1") {
$rss = new SimplePie();
$rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
// $rss->set_timeout(MAGPIE_FETCH_TIME_OUT);
}
$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");
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;
+ }
+
?>
git.wh0rd.org / tt-rss.git / blobdiff