diff options
| author | Andrew Dolgov <[email protected]> | 2012-06-03 20:02:51 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-06-03 20:02:51 +0400 |
| commit | 184f51952c2c0bdcafab9d22a9367facbea28376 (patch) | |
| tree | 786b8c41bab376d1133f6732ec36343f83866d1f /include | |
| parent | c21a462d52bd32737c32c29b060da03b38f1c2e6 (diff) | |
experimental tweak to not mark articles newer than last one loaded in the buffer as read
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/include/functions.php b/include/functions.php index d11d62d22..346396ed6 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1320,12 +1320,14 @@ } } - function catchup_feed($link, $feed, $cat_view, $owner_uid = false) { + function catchup_feed($link, $feed, $cat_view, $owner_uid = false, $max_id = false) { if (!$owner_uid) $owner_uid = $_SESSION['uid']; //if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) { + $ref_check_qpart = ($max_id) ? "ref_id <= '$max_id'" : "true"; + if (is_numeric($feed)) { if ($cat_view) { @@ -1346,34 +1348,43 @@ db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() - WHERE feed_id = '$tmp_feed' AND owner_uid = $owner_uid"); + WHERE feed_id = '$tmp_feed' + AND $ref_check_qpart + AND owner_uid = $owner_uid"); } } else if ($feed == -2) { db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*) FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0 - AND unread = true AND owner_uid = $owner_uid"); + AND $ref_check_qpart + AND unread = true AND owner_uid = $owner_uid"); } } else if ($feed > 0) { db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() - WHERE feed_id = '$feed' AND owner_uid = $owner_uid"); + WHERE feed_id = '$feed' + AND $ref_check_qpart + AND owner_uid = $owner_uid"); } else if ($feed < 0 && $feed > -10) { // special, like starred if ($feed == -1) { db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() - WHERE marked = true AND owner_uid = $owner_uid"); + WHERE marked = true + AND $ref_check_qpart + AND owner_uid = $owner_uid"); } if ($feed == -2) { db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() - WHERE published = true AND owner_uid = $owner_uid"); + WHERE published = true + AND $ref_check_qpart + AND owner_uid = $owner_uid"); } if ($feed == -3) { @@ -1405,7 +1416,7 @@ if ($feed == -4) { db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() - WHERE owner_uid = $owner_uid"); + WHERE $ref_check_qpart AND owner_uid = $owner_uid"); } } else if ($feed < -10) { // label @@ -1415,6 +1426,7 @@ db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2 SET unread = false, last_read = NOW() WHERE label_id = '$label_id' AND unread = true + AND $ref_check_qpart AND owner_uid = '$owner_uid' AND ref_id = article_id"); } @@ -1432,7 +1444,7 @@ while ($line = db_fetch_assoc($result)) { db_query($link, "UPDATE ttrss_user_entries SET unread = false, last_read = NOW() - WHERE int_id = " . $line["post_int_id"]); + WHERE $ref_check_qpart AND int_id = " . $line["post_int_id"]); } db_query($link, "COMMIT"); } |