valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change various catchup stuff to only affect unread articles

This commit is contained in:
Andrew Dolgov 2013-02-26 22:49:46 +04:00
parent be17885789
commit 1bad74ea7c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/feeds.php
View File

@ -745,7 +745,7 @@ class Feeds extends Handler_Protected {
function catchupAll() {
db_query($this->link, "UPDATE ttrss_user_entries SET
last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);
last_read = NOW(), unread = false WHERE unread = true AND owner_uid = " . $_SESSION["uid"]);
ccache_zero_all($this->link, $_SESSION["uid"]);
}

14
include/functions.php
View File

@ -990,7 +990,7 @@
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
WHERE feed_id IN (SELECT id FROM ttrss_feeds WHERE $cat_qpart)
AND $ref_check_qpart
AND $ref_check_qpart AND unread = true
AND owner_uid = $owner_uid");
} else if ($feed == -2) {
@ -1007,7 +1007,7 @@
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
WHERE feed_id = '$feed'
AND $ref_check_qpart
AND $ref_check_qpart AND unread = true
AND owner_uid = $owner_uid");
} else if ($feed < 0 && $feed > -10) { // special, like starred
@ -1016,7 +1016,7 @@
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
WHERE marked = true
AND $ref_check_qpart
AND $ref_check_qpart AND unread = true
AND owner_uid = $owner_uid");
}
@ -1024,7 +1024,7 @@
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
WHERE published = true
AND $ref_check_qpart
AND $ref_check_qpart AND unread = true
AND owner_uid = $owner_uid");
}
@ -1057,7 +1057,8 @@
if ($feed == -4) {
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
WHERE $ref_check_qpart AND owner_uid = $owner_uid");
WHERE $ref_check_qpart AND unread = true AND
owner_uid = $owner_uid");
}
} else if ($feed < -10) { // label
@ -1085,7 +1086,8 @@
while ($line = db_fetch_assoc($result)) {
db_query($link, "UPDATE ttrss_user_entries SET
unread = false, last_read = NOW()
WHERE $ref_check_qpart AND int_id = " . $line["post_int_id"]);
WHERE $ref_check_qpart AND unread = true
AND int_id = " . $line["post_int_id"]);
}
db_query($link, "COMMIT");
}