blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

daemon: properly pass owner_uid to catchup_feed when catching up a newly subscribed feed

Browse source
This commit is contained in:
Andrew Dolgov 2009-03-06 18:21:54 +03:00
parent c205bb8d15
commit 44503b4673
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
functions.php
View file

@ -1384,7 +1384,7 @@
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) { if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
_debug("update_rss_feed: new feed, catching it up..."); _debug("update_rss_feed: new feed, catching it up...");
} }
catchup_feed($link, $feed, false); catchup_feed($link, $feed, false, $owner_uid);
} }
if (!$hidden) { if (!$hidden) {
@ -2120,7 +2120,9 @@
} }
} }
function catchup_feed($link, $feed, $cat_view) { function catchup_feed($link, $feed, $cat_view, $owner_uid) {
if (!$owner_uid) $owner_uid = $_SESSION['uid'];
if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) { if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
@ -2135,8 +2137,7 @@
} }
$tmp_result = db_query($link, "SELECT id $tmp_result = db_query($link, "SELECT id
FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = " . FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = $owner_uid");
$_SESSION["uid"]);
while ($tmp_line = db_fetch_assoc($tmp_result)) { while ($tmp_line = db_fetch_assoc($tmp_result)) {
@ -2144,7 +2145,7 @@
db_query($link, "UPDATE ttrss_user_entries db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW() SET unread = false,last_read = NOW()
WHERE feed_id = '$tmp_feed' AND owner_uid = " . $_SESSION["uid"]); WHERE feed_id = '$tmp_feed' AND owner_uid = $owner_uid");
} }
} else if ($feed == -2) { } else if ($feed == -2) {
@ -2152,7 +2153,7 @@
db_query($link, "UPDATE ttrss_user_entries db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*) SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0 FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0
AND unread = true AND owner_uid = " . $_SESSION["uid"]); AND unread = true AND owner_uid = $owner_uid");
} }
} else if ($feed > 0) { } else if ($feed > 0) {
@ -2173,12 +2174,12 @@
db_query($link, "UPDATE ttrss_user_entries db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW() SET unread = false,last_read = NOW()
WHERE (feed_id = '$feed' OR $children_qpart) WHERE (feed_id = '$feed' OR $children_qpart)
AND owner_uid = " . $_SESSION["uid"]); AND owner_uid = $owner_uid");
} else { } else {
db_query($link, "UPDATE ttrss_user_entries db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW() SET unread = false,last_read = NOW()
WHERE feed_id = '$feed' AND owner_uid = " . $_SESSION["uid"]); WHERE feed_id = '$feed' AND owner_uid = $owner_uid");
} }
} else if ($feed < 0 && $feed > -10) { // special, like starred } else if ($feed < 0 && $feed > -10) { // special, like starred
@ -2186,13 +2187,13 @@
if ($feed == -1) { if ($feed == -1) {
db_query($link, "UPDATE ttrss_user_entries db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW() SET unread = false,last_read = NOW()
WHERE marked = true AND owner_uid = ".$_SESSION["uid"]); WHERE marked = true AND owner_uid = $owner_uid");
} }
if ($feed == -2) { if ($feed == -2) {
db_query($link, "UPDATE ttrss_user_entries db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW() SET unread = false,last_read = NOW()
WHERE published = true AND owner_uid = ".$_SESSION["uid"]); WHERE published = true AND owner_uid = $owner_uid");
} }
if ($feed == -3) { if ($feed == -3) {
@ -2210,7 +2211,7 @@
ttrss_user_entries WHERE $match_part AND ttrss_user_entries WHERE $match_part AND
unread = true AND unread = true AND
ttrss_user_entries.ref_id = ttrss_entries.id AND ttrss_user_entries.ref_id = ttrss_entries.id AND
owner_uid = ".$_SESSION["uid"]); owner_uid = $owner_uid");
$affected_ids = array(); $affected_ids = array();
@ -2224,7 +2225,7 @@
if ($feed == -4) { if ($feed == -4) {
db_query($link, "UPDATE ttrss_user_entries db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW() SET unread = false,last_read = NOW()
WHERE owner_uid = ".$_SESSION["uid"]); WHERE owner_uid = $owner_uid");
} }
} else if ($feed < -10) { // label } else if ($feed < -10) { // label
@ -2234,7 +2235,7 @@
db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2 db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2
SET unread = false, last_read = NOW() SET unread = false, last_read = NOW()
WHERE label_id = '$label_id' AND unread = true WHERE label_id = '$label_id' AND unread = true
AND owner_uid = '".$_SESSION["uid"]."' AND ref_id = article_id"); AND owner_uid = '$owner_uid' AND ref_id = article_id");
} }
@ -2246,7 +2247,7 @@
$tag_name = db_escape_string($feed); $tag_name = db_escape_string($feed);
$result = db_query($link, "SELECT post_int_id FROM ttrss_tags $result = db_query($link, "SELECT post_int_id FROM ttrss_tags
WHERE tag_name = '$tag_name' AND owner_uid = " . $_SESSION["uid"]); WHERE tag_name = '$tag_name' AND owner_uid = $owner_uid");
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
db_query($link, "UPDATE ttrss_user_entries SET db_query($link, "UPDATE ttrss_user_entries SET