Merge pull request #10 from wjchen/master
Improve sql command and add starred,published,archived, shared items to saved items for fever api.
This commit is contained in:
@@ -489,14 +489,13 @@ class FeverAPI extends Handler {
|
|||||||
function getUnreadItemIds()
|
function getUnreadItemIds()
|
||||||
{
|
{
|
||||||
$unreadItemIdsCSV = "";
|
$unreadItemIdsCSV = "";
|
||||||
$result = $this->dbh->query("SELECT ref_id, unread
|
$result = $this->dbh->query("SELECT ref_id
|
||||||
FROM ttrss_user_entries
|
FROM ttrss_user_entries
|
||||||
WHERE owner_uid = '" . db_escape_string($_SESSION["uid"]) . "'"); // ORDER BY red_id DESC
|
WHERE owner_uid = '" . db_escape_string($_SESSION["uid"]) . "'" . "AND unread"); // ORDER BY red_id DESC
|
||||||
|
|
||||||
while ($line = $this->dbh->fetch_assoc($result))
|
while ($line = $this->dbh->fetch_assoc($result))
|
||||||
{
|
{
|
||||||
if (sql_bool_to_bool($line["unread"]))
|
$unreadItemIdsCSV .= $line["ref_id"] . ",";
|
||||||
$unreadItemIdsCSV .= $line["ref_id"] . ",";
|
|
||||||
}
|
}
|
||||||
$unreadItemIdsCSV = trim($unreadItemIdsCSV, ",");
|
$unreadItemIdsCSV = trim($unreadItemIdsCSV, ",");
|
||||||
|
|
||||||
@@ -506,14 +505,13 @@ class FeverAPI extends Handler {
|
|||||||
function getSavedItemIds()
|
function getSavedItemIds()
|
||||||
{
|
{
|
||||||
$savedItemIdsCSV = "";
|
$savedItemIdsCSV = "";
|
||||||
$result = $this->dbh->query("SELECT ref_id, marked
|
$result = $this->dbh->query("SELECT ref_id
|
||||||
FROM ttrss_user_entries
|
FROM ttrss_user_entries
|
||||||
WHERE owner_uid = '" . db_escape_string($_SESSION["uid"]) . "'");
|
WHERE owner_uid = '" . db_escape_string($_SESSION["uid"]) . "'" . "AND marked OR published OR feed_id IS NULL OR uuid != ''");
|
||||||
|
|
||||||
while ($line = $this->dbh->fetch_assoc($result))
|
while ($line = $this->dbh->fetch_assoc($result))
|
||||||
{
|
{
|
||||||
if (sql_bool_to_bool($line["marked"]))
|
$savedItemIdsCSV .= $line["ref_id"] . ",";
|
||||||
$savedItemIdsCSV .= $line["ref_id"] . ",";
|
|
||||||
}
|
}
|
||||||
$savedItemIdsCSV = trim($savedItemIdsCSV, ",");
|
$savedItemIdsCSV = trim($savedItemIdsCSV, ",");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user