|
|
|
@ -1163,15 +1163,14 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function catchup_feed($feed, $cat_view, $owner_uid = false, $max_id = false, $mode = 'all') {
|
|
|
|
|
function catchup_feed($feed, $cat_view, $owner_uid = false, $max_id = false, $mode = 'all', $search = false) {
|
|
|
|
|
|
|
|
|
|
if (!$owner_uid) $owner_uid = $_SESSION['uid'];
|
|
|
|
|
|
|
|
|
|
//if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
|
|
|
|
|
|
|
|
|
|
// Todo: all this interval stuff needs some generic generator function
|
|
|
|
|
|
|
|
|
|
$date_qpart = "false";
|
|
|
|
|
$search_qpart = is_array($search) && $search[0] ? search_to_sql($search[0], $search[1])[0] : 'true';
|
|
|
|
|
|
|
|
|
|
switch ($mode) {
|
|
|
|
|
case "1day":
|
|
|
|
@ -1220,13 +1219,13 @@
|
|
|
|
|
(SELECT id FROM
|
|
|
|
|
(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND feed_id IN
|
|
|
|
|
(SELECT id FROM ttrss_feeds WHERE $cat_qpart) AND $date_qpart) as tmp)");
|
|
|
|
|
(SELECT id FROM ttrss_feeds WHERE $cat_qpart) AND $date_qpart AND $search_qpart) as tmp)");
|
|
|
|
|
|
|
|
|
|
} else if ($feed == -2) {
|
|
|
|
|
|
|
|
|
|
db_query("UPDATE ttrss_user_entries
|
|
|
|
|
SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
|
|
|
|
|
FROM ttrss_user_labels2, ttrss_entries WHERE article_id = ref_id AND id = ref_id AND $date_qpart) > 0
|
|
|
|
|
FROM ttrss_user_labels2, ttrss_entries WHERE article_id = ref_id AND id = ref_id AND $date_qpart AND $search_qpart) > 0
|
|
|
|
|
AND unread = true AND owner_uid = $owner_uid");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -1236,7 +1235,7 @@
|
|
|
|
|
SET unread = false, last_read = NOW() WHERE ref_id IN
|
|
|
|
|
(SELECT id FROM
|
|
|
|
|
(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND feed_id = $feed AND $date_qpart) as tmp)");
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND feed_id = $feed AND $date_qpart AND $search_qpart) as tmp)");
|
|
|
|
|
|
|
|
|
|
} else if ($feed < 0 && $feed > LABEL_BASE_INDEX) { // special, like starred
|
|
|
|
|
|
|
|
|
@ -1245,7 +1244,7 @@
|
|
|
|
|
SET unread = false, last_read = NOW() WHERE ref_id IN
|
|
|
|
|
(SELECT id FROM
|
|
|
|
|
(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND marked = true AND $date_qpart) as tmp)");
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND marked = true AND $date_qpart AND $search_qpart) as tmp)");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($feed == -2) {
|
|
|
|
@ -1253,7 +1252,7 @@
|
|
|
|
|
SET unread = false, last_read = NOW() WHERE ref_id IN
|
|
|
|
|
(SELECT id FROM
|
|
|
|
|
(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND published = true AND $date_qpart) as tmp)");
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND published = true AND $date_qpart AND $search_qpart) as tmp)");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($feed == -3) {
|
|
|
|
@ -1271,7 +1270,7 @@
|
|
|
|
|
SET unread = false, last_read = NOW() WHERE ref_id IN
|
|
|
|
|
(SELECT id FROM
|
|
|
|
|
(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
|
|
|
|
|
AND owner_uid = $owner_uid AND score >= 0 AND unread = true AND $date_qpart AND $match_part) as tmp)");
|
|
|
|
|
AND owner_uid = $owner_uid AND score >= 0 AND unread = true AND $date_qpart AND $match_part AND $search_qpart) as tmp)");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($feed == -4) {
|
|
|
|
@ -1279,7 +1278,7 @@
|
|
|
|
|
SET unread = false, last_read = NOW() WHERE ref_id IN
|
|
|
|
|
(SELECT id FROM
|
|
|
|
|
(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND $date_qpart) as tmp)");
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND $date_qpart AND $search_qpart) as tmp)");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} else if ($feed < LABEL_BASE_INDEX) { // label
|
|
|
|
@ -1291,7 +1290,7 @@
|
|
|
|
|
(SELECT id FROM
|
|
|
|
|
(SELECT DISTINCT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_user_labels2 WHERE ref_id = id
|
|
|
|
|
AND label_id = '$label_id' AND ref_id = article_id
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND $date_qpart) as tmp)");
|
|
|
|
|
AND owner_uid = $owner_uid AND unread = true AND $date_qpart AND $search_qpart) as tmp)");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -1303,7 +1302,7 @@
|
|
|
|
|
(SELECT id FROM
|
|
|
|
|
(SELECT DISTINCT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_tags WHERE ref_id = ttrss_entries.id
|
|
|
|
|
AND post_int_id = int_id AND tag_name = '$feed'
|
|
|
|
|
AND ttrss_user_entries.owner_uid = $owner_uid AND unread = true AND $date_qpart) as tmp)");
|
|
|
|
|
AND ttrss_user_entries.owner_uid = $owner_uid AND unread = true AND $date_qpart AND $search_qpart) as tmp)");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|