backend/la: properly handle situation when article has multiple ref_ids on one accoun...

[tt-rss.git] / backend.php

diff --git a/backend.php b/backend.php
index 3e2633dcaa8743e60740c8b539cf259ea9eed087..6b93d1b3c5444c55079fa68e8bdc05b1ca3cc40c 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -181,7 +181,8 @@
                        $id = db_escape_string($_REQUEST['id']);
 
                        $result = db_query($link, "SELECT link FROM ttrss_entries, ttrss_user_entries
-                               WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'");
+                               WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'
+                               LIMIT 1");
 
                        if (db_num_rows($result) == 1) {
                                $article_url = db_fetch_result($result, 0, 'link');
@@ -585,8 +586,7 @@
 
                case "fbexport":
 
-                       // TODO: change to _POST
-                       $access_key = db_escape_string($_REQUEST["key"]);
+                       $access_key = db_escape_string($_POST["key"]);
 
                        // TODO: rate limit checking using last_connected
                        $result = db_query($link, "SELECT id FROM ttrss_linked_instances
@@ -596,7 +596,7 @@
 
                                $instance_id = db_fetch_result($result, 0, "id");
 
-                               $result = db_query($link, "SELECT feed_url, title, subscribers
+                               $result = db_query($link, "SELECT feed_url, site_url, title, subscribers
                                        FROM ttrss_feedbrowser_cache ORDER BY subscribers DESC LIMIT 100");
 
                                $feeds = array();
@@ -605,15 +605,11 @@
                                        array_push($feeds, $line);
                                }
 
-                               db_query($link, "UPDATE ttrss_linked_instances SET,
+                               db_query($link, "UPDATE ttrss_linked_instances SET
                                        last_status_in = 1 WHERE id = '$instance_id'");
 
                                print json_encode(array("feeds" => $feeds));
                        } else {
-
-                               db_query($link, "UPDATE ttrss_linked_instances SET,
-                                       last_status_in = 0 WHERE id = '$instance_id'");
-
                                print json_encode(array("error" => array("code" => 6)));
                        }
                break; // fbexport