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

fix possible bug in tag-processing part of update_rss_feed

Browse source
This commit is contained in:
Andrew Dolgov 2005-11-21 08:27:17 +01:00
parent a277007718
commit fe99ab12bb
2 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
backend.php
View file

@ -1969,7 +1969,8 @@
</table>"; </table>";
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id,login,access_level,last_login id,login,access_level,
SUBSTRING(last_login,1,16) as last_login
FROM FROM
ttrss_users ttrss_users
ORDER by login"); ORDER by login");
@ -2090,7 +2091,9 @@
print "<div class='infoBoxContents'>"; print "<div class='infoBoxContents'>";
$result = db_query($link, "SELECT login,last_login,access_level, $result = db_query($link, "SELECT login,
SUBSTRING(last_login,1,16) AS last_login,
access_level,
(SELECT COUNT(int_id) FROM ttrss_user_entries (SELECT COUNT(int_id) FROM ttrss_user_entries
WHERE owner_uid = id) AS stored_articles WHERE owner_uid = id) AS stored_articles
FROM ttrss_users FROM ttrss_users

49
functions.php
View file

@ -414,32 +414,31 @@
AND feed_id = '$feed' AND ref_id = id AND feed_id = '$feed' AND ref_id = id
AND owner_uid = '$owner_uid'"); AND owner_uid = '$owner_uid'");
if (!$result || db_num_rows($result) != 1) { if (db_num_rows($result) == 1) {
return;
}
$entry_id = db_fetch_result($result, 0, "id"); $entry_id = db_fetch_result($result, 0, "id");
$entry_int_id = db_fetch_result($result, 0, "int_id"); $entry_int_id = db_fetch_result($result, 0, "int_id");
foreach ($entry_tags as $tag) { foreach ($entry_tags as $tag) {
$tag = db_escape_string(strtolower($tag)); $tag = db_escape_string(strtolower($tag));
$tag = str_replace("technorati tag: ", "", $tag); $tag = str_replace("technorati tag: ", "", $tag);
$result = db_query($link, "SELECT id FROM ttrss_tags $result = db_query($link, "SELECT id FROM ttrss_tags
WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND
owner_uid = '$owner_uid' LIMIT 1"); owner_uid = '$owner_uid' LIMIT 1");
// print db_fetch_result($result, 0, "id"); // print db_fetch_result($result, 0, "id");
if ($result && db_num_rows($result) == 0) { if ($result && db_num_rows($result) == 0) {
// print "tagging $entry_id as $tag<br>"; // print "tagging $entry_id as $tag<br>";
db_query($link, "INSERT INTO ttrss_tags db_query($link, "INSERT INTO ttrss_tags
(owner_uid,tag_name,post_int_id) (owner_uid,tag_name,post_int_id)
VALUES ('$owner_uid','$tag', '$entry_int_id')"); VALUES ('$owner_uid','$tag', '$entry_int_id')");
} }
}
} }
} }
} }