]> git.wh0rd.org - tt-rss.git/blobdiff - classes/rpc.php
git.wh0rd.org / tt-rss.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
move several methods from dlg; fix displayed tags not updated after editing
[tt-rss.git] / classes / rpc.php
diff --git a/classes/rpc.php b/classes/rpc.php
index 139f1fe49e0012503710f65dad3ffddefcf4a881..34f623b061b594ec043a433d660b659f779cbafc 100644 (file)
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -8,14 +8,14 @@ class RPC extends Handler_Protected {
        }
 
        function setprofile() {
-               $id = db_escape_string($_REQUEST["id"]);
+               $id = db_escape_string($this->link, $_REQUEST["id"]);
 
                $_SESSION["profile"] = $id;
                $_SESSION["prefs_cache"] = array();
        }
 
        function remprofiles() {
-               $ids = explode(",", db_escape_string(trim($_REQUEST["ids"])));
+               $ids = explode(",", db_escape_string($this->link, trim($_REQUEST["ids"])));
 
                foreach ($ids as $id) {
                        if ($_SESSION["profile"] != $id) {
@@ -27,7 +27,7 @@ class RPC extends Handler_Protected {
 
        // Silent
        function addprofile() {
-               $title = db_escape_string(trim($_REQUEST["title"]));
+               $title = db_escape_string($this->link, trim($_REQUEST["title"]));
                if ($title) {
                        db_query($this->link, "BEGIN");
 
@@ -57,8 +57,8 @@ class RPC extends Handler_Protected {
 
        // Silent
        function saveprofile() {
-               $id = db_escape_string($_REQUEST["id"]);
-               $title = db_escape_string(trim($_REQUEST["value"]));
+               $id = db_escape_string($this->link, $_REQUEST["id"]);
+               $title = db_escape_string($this->link, trim($_REQUEST["value"]));
 
                if ($id == 0) {
                        print __("Default profile");
@@ -88,7 +88,7 @@ class RPC extends Handler_Protected {
 
        // Silent
        function remarchive() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
 
                foreach ($ids as $id) {
                        $result = db_query($this->link, "DELETE FROM ttrss_archived_feeds WHERE
@@ -101,19 +101,18 @@ class RPC extends Handler_Protected {
        }
 
        function addfeed() {
-               $feed = db_escape_string($_REQUEST['feed']);
-               $cat = db_escape_string($_REQUEST['cat']);
-               $login = db_escape_string($_REQUEST['login']);
-               $pass = db_escape_string($_REQUEST['pass']);
-               $need_auth = db_escape_string($_REQUEST['need_auth']) != "";
+               $feed = db_escape_string($this->link, $_REQUEST['feed']);
+               $cat = db_escape_string($this->link, $_REQUEST['cat']);
+               $login = db_escape_string($this->link, $_REQUEST['login']);
+               $pass = db_escape_string($this->link, $_REQUEST['pass']);
 
-               $rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass, $need_auth);
+               $rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass);
 
                print json_encode(array("result" => $rc));
        }
 
        function togglepref() {
-               $key = db_escape_string($_REQUEST["key"]);
+               $key = db_escape_string($this->link, $_REQUEST["key"]);
                set_pref($this->link, $key, !get_pref($this->link, $key));
                $value = get_pref($this->link, $key);
 
@@ -132,7 +131,7 @@ class RPC extends Handler_Protected {
 
        function mark() {
                $mark = $_REQUEST["mark"];
-               $id = db_escape_string($_REQUEST["id"]);
+               $id = db_escape_string($this->link, $_REQUEST["id"]);
 
                if ($mark == "1") {
                        $mark = "true";
@@ -148,26 +147,75 @@ class RPC extends Handler_Protected {
        }
 
        function delete() {
-               $ids = db_escape_string($_REQUEST["ids"]);
+               $ids = db_escape_string($this->link, $_REQUEST["ids"]);
 
                $result = db_query($this->link, "DELETE FROM ttrss_user_entries
                WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
+               purge_orphans($this->link);
+
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function unarchive() {
-               $ids = db_escape_string($_REQUEST["ids"]);
+               $ids = explode(",", $_REQUEST["ids"]);
+
+               foreach ($ids as $id) {
+                       $id = db_escape_string($this->link, trim($id));
+                       db_query($this->link, "BEGIN");
+
+                       $result = db_query($this->link, "SELECT feed_url,site_url,title FROM ttrss_archived_feeds
+                               WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = $id
+                               AND owner_uid = ".$_SESSION["uid"].")");
+
+                       if (db_num_rows($result) != 0) {
+                               $feed_url = db_escape_string($this->link, db_fetch_result($result, 0, "feed_url"));
+                               $site_url = db_escape_string($this->link, db_fetch_result($result, 0, "site_url"));
+                               $title = db_escape_string($this->link, db_fetch_result($result, 0, "title"));
+
+                               $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
+                                       AND owner_uid = " .$_SESSION["uid"]);
+
+                               if (db_num_rows($result) == 0) {
+
+                                       if (!$title) $title = '[Unknown]';
+
+                                       $result = db_query($this->link,
+                                               "INSERT INTO ttrss_feeds
+                                                       (owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
+                                                       VALUES (".$_SESSION["uid"].",
+                                                       '$feed_url',
+                                                       '$site_url',
+                                                       '$title',
+                                                       NULL, '', '', 0)");
+
+                                       $result = db_query($this->link,
+                                               "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
+                                               AND owner_uid = ".$_SESSION["uid"]);
+
+                                       if (db_num_rows($result) != 0) {
+                                               $feed_id = db_fetch_result($result, 0, "id");
+                                       }
+
+                               } else {
+                                       $feed_id = db_fetch_result($result, 0, "id");
+                               }
+
+                               if ($feed_id) {
+                                       $result = db_query($this->link, "UPDATE ttrss_user_entries
+                                               SET feed_id = '$feed_id', orig_feed_id = NULL
+                                               WHERE ref_id = $id AND owner_uid = " . $_SESSION["uid"]);
+                               }
+                       }
 
-               $result = db_query($this->link, "UPDATE ttrss_user_entries
-                                       SET feed_id = orig_feed_id, orig_feed_id = NULL
-                                       WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
+                       db_query($this->link, "COMMIT");
+               }
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function archive() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
 
                foreach ($ids as $id) {
                        $this->archive_article($this->link, $id, $_SESSION["uid"]);
@@ -210,8 +258,8 @@ class RPC extends Handler_Protected {
 
        function publ() {
                $pub = $_REQUEST["pub"];
-               $id = db_escape_string($_REQUEST["id"]);
-               $note = trim(strip_tags(db_escape_string($_REQUEST["note"])));
+               $id = db_escape_string($this->link, $_REQUEST["id"]);
+               $note = trim(strip_tags(db_escape_string($this->link, $_REQUEST["note"])));
 
                if ($pub == "1") {
                        $pub = "true";
@@ -257,7 +305,7 @@ class RPC extends Handler_Protected {
 
        /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
        function catchupSelected() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
                $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
                catchupArticlesById($this->link, $ids, $cmode);
@@ -266,7 +314,7 @@ class RPC extends Handler_Protected {
        }
 
        function markSelected() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
                $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
                $this->markArticlesById($this->link, $ids, $cmode);
@@ -275,7 +323,7 @@ class RPC extends Handler_Protected {
        }
 
        function publishSelected() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
                $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
                $this->publishArticlesById($this->link, $ids, $cmode);
@@ -301,9 +349,9 @@ class RPC extends Handler_Protected {
 
        function setArticleTags() {
 
-               $id = db_escape_string($_REQUEST["id"]);
+               $id = db_escape_string($this->link, $_REQUEST["id"]);
 
-               $tags_str = db_escape_string($_REQUEST["tags_str"]);
+               $tags_str = db_escape_string($this->link, $_REQUEST["tags_str"]);
                $tags = array_unique(trim_array(explode(",", $tags_str)));
 
                db_query($this->link, "BEGIN");
@@ -359,8 +407,8 @@ class RPC extends Handler_Protected {
 
                if (!$tags_str_full) $tags_str_full = __("no tags");
 
-               print json_encode(array("tags_str" => array("id" => $id,
-                               "content" => $tags_str, "content_full" => $tags_str_full)));
+               print json_encode(array("id" => (int)$id,
+                               "content" => $tags_str, "content_full" => $tags_str_full));
        }
 
        function regenOPMLKey() {
@@ -373,7 +421,7 @@ class RPC extends Handler_Protected {
        }
 
        function completeLabels() {
-               $search = db_escape_string($_REQUEST["search"]);
+               $search = db_escape_string($this->link, $_REQUEST["search"]);
 
                $result = db_query($this->link, "SELECT DISTINCT caption FROM
                                ttrss_labels2
@@ -390,7 +438,7 @@ class RPC extends Handler_Protected {
 
 
        function completeTags() {
-               $search = db_escape_string($_REQUEST["search"]);
+               $search = db_escape_string($this->link, $_REQUEST["search"]);
 
                $result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags
                                WHERE owner_uid = '".$_SESSION["uid"]."' AND
@@ -405,7 +453,7 @@ class RPC extends Handler_Protected {
        }
 
        function purge() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
                $days = sprintf("%d", $_REQUEST["days"]);
 
                foreach ($ids as $id) {
@@ -420,7 +468,7 @@ class RPC extends Handler_Protected {
        }
 
        function getArticles() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
                $articles = array();
 
                foreach ($ids as $id) {
@@ -433,7 +481,7 @@ class RPC extends Handler_Protected {
        }
 
        function checkDate() {
-               $date = db_escape_string($_REQUEST["date"]);
+               $date = db_escape_string($this->link, $_REQUEST["date"]);
                $date_parsed = strtotime($date);
 
                print json_encode(array("result" => (bool)$date_parsed,
@@ -451,10 +499,10 @@ class RPC extends Handler_Protected {
        function labelops($assign) {
                $reply = array();
 
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
-               $label_id = db_escape_string($_REQUEST["lid"]);
+               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+               $label_id = db_escape_string($this->link, $_REQUEST["lid"]);
 
-               $label = db_escape_string(label_find_caption($this->link, $label_id,
+               $label = db_escape_string($this->link, label_find_caption($this->link, $label_id,
                $_SESSION["uid"]));
 
                $reply["info-for-headlines"] = array();
@@ -482,9 +530,9 @@ class RPC extends Handler_Protected {
        }
 
        function updateFeedBrowser() {
-               $search = db_escape_string($_REQUEST["search"]);
-               $limit = db_escape_string($_REQUEST["limit"]);
-               $mode = (int) db_escape_string($_REQUEST["mode"]);
+               $search = db_escape_string($this->link, $_REQUEST["search"]);
+               $limit = db_escape_string($this->link, $_REQUEST["limit"]);
+               $mode = (int) db_escape_string($this->link, $_REQUEST["mode"]);
 
                require_once "feedbrowser.php";
 
@@ -504,8 +552,8 @@ class RPC extends Handler_Protected {
                if ($mode == 1) {
                        foreach ($payload as $feed) {
 
-                               $title = db_escape_string($feed[0]);
-                               $feed_url = db_escape_string($feed[1]);
+                               $title = db_escape_string($this->link, $feed[0]);
+                               $feed_url = db_escape_string($this->link, $feed[1]);
 
                                $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
                                        feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
@@ -524,9 +572,9 @@ class RPC extends Handler_Protected {
                                        WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
                                if (db_num_rows($result) != 0) {
-                                       $site_url = db_escape_string(db_fetch_result($result, 0, "site_url"));
-                                       $feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url"));
-                                       $title = db_escape_string(db_fetch_result($result, 0, "title"));
+                                       $site_url = db_escape_string($this->link, db_fetch_result($result, 0, "site_url"));
+                                       $feed_url = db_escape_string($this->link, db_fetch_result($result, 0, "feed_url"));
+                                       $title = db_escape_string($this->link, db_fetch_result($result, 0, "title"));
 
                                        $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
                                                feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
@@ -543,17 +591,17 @@ class RPC extends Handler_Protected {
        }
 
        function catchupFeed() {
-               $feed_id = db_escape_string($_REQUEST['feed_id']);
-               $is_cat = db_escape_string($_REQUEST['is_cat']) == "true";
-               $max_id = (int) db_escape_string($_REQUEST['max_id']);
+               $feed_id = db_escape_string($this->link, $_REQUEST['feed_id']);
+               $is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
+               $mode = db_escape_string($this->link, $_REQUEST['mode']);
 
-               catchup_feed($this->link, $feed_id, $is_cat, false, $max_id);
+               catchup_feed($this->link, $feed_id, $is_cat, false, false, $mode);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function quickAddCat() {
-               $cat = db_escape_string($_REQUEST["cat"]);
+               $cat = db_escape_string($this->link, $_REQUEST["cat"]);
 
                add_feed_category($this->link, $cat);
 
@@ -570,8 +618,8 @@ class RPC extends Handler_Protected {
        }
 
        function regenFeedKey() {
-               $feed_id = db_escape_string($_REQUEST['id']);
-               $is_cat = db_escape_string($_REQUEST['is_cat']) == "true";
+               $feed_id = db_escape_string($this->link, $_REQUEST['id']);
+               $is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
 
                $new_key = $this->update_feed_access_key($this->link, $feed_id, $is_cat);
 
@@ -619,11 +667,10 @@ class RPC extends Handler_Protected {
        }
 
        function batchAddFeeds() {
-               $cat_id = db_escape_string($_REQUEST['cat']);
-               $feeds = explode("\n", db_escape_string($_REQUEST['feeds']));
-               $login = db_escape_string($_REQUEST['login']);
-               $pass = db_escape_string($_REQUEST['pass']);
-               $need_auth = db_escape_string($_REQUEST['need_auth']) != "";
+               $cat_id = db_escape_string($this->link, $_REQUEST['cat']);
+               $feeds = explode("\n", db_escape_string($this->link, $_REQUEST['feeds']));
+               $login = db_escape_string($this->link, $_REQUEST['login']);
+               $pass = db_escape_string($this->link, $_REQUEST['pass']);
 
                foreach ($feeds as $feed) {
                        $feed = trim($feed);
@@ -656,8 +703,8 @@ class RPC extends Handler_Protected {
        }
 
        function setScore() {
-               $ids = db_escape_string($_REQUEST['id']);
-               $score = (int)db_escape_string($_REQUEST['score']);
+               $ids = db_escape_string($this->link, $_REQUEST['id']);
+               $score = (int)db_escape_string($this->link, $_REQUEST['score']);
 
                db_query($this->link, "UPDATE ttrss_user_entries SET
                        score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
@@ -737,6 +784,10 @@ class RPC extends Handler_Protected {
                        }
                }
 
+               // Purge orphans and cleanup tags
+               purge_orphans($this->link);
+               cleanup_tags($this->link, 14, 50000);
+
                if ($num_updated > 0) {
                        print json_encode(array("message" => "UPDATE_COUNTERS",
                                "num_updated" => $num_updated));
@@ -756,7 +807,7 @@ class RPC extends Handler_Protected {
                        AND owner_uid = " . $owner_uid);
 
                if (db_num_rows($result) == 1) {
-                       $key = db_escape_string(sha1(uniqid(rand(), true)));
+                       $key = db_escape_string($this->link, sha1(uniqid(rand(), true)));
 
                        db_query($link, "UPDATE ttrss_access_keys SET access_key = '$key'
                                WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
@@ -829,5 +880,48 @@ class RPC extends Handler_Protected {
                }
        }
 
+       function getlinktitlebyid() {
+               $id = db_escape_string($this->link, $_REQUEST['id']);
+
+               $result = db_query($this->link, "SELECT link, title FROM ttrss_entries, ttrss_user_entries
+                       WHERE ref_id = '$id' AND ref_id = id AND owner_uid = ". $_SESSION["uid"]);
+
+               if (db_num_rows($result) != 0) {
+                       $link = db_fetch_result($result, 0, "link");
+                       $title = db_fetch_result($result, 0, "title");
+
+                       echo json_encode(array("link" => $link, "title" => $title));
+               } else {
+                       echo json_encode(array("error" => "ARTICLE_NOT_FOUND"));
+               }
+       }
+
+       function cdmArticlePreview() {
+               $id = db_escape_string($this->link, $_REQUEST['id']);
+
+               $result = db_query($this->link, "SELECT link,
+                       ttrss_entries.title, content, feed_url
+                       FROM
+                       ttrss_entries, ttrss_user_entries
+                               LEFT JOIN ttrss_feeds ON (ttrss_user_entries.feed_id = ttrss_feeds.id)
+                       WHERE ref_id = '$id' AND ref_id = ttrss_entries.id AND
+                               ttrss_user_entries.owner_uid = ". $_SESSION["uid"]);
+
+               if (db_num_rows($result) != 0) {
+                       $link = db_fetch_result($result, 0, "link");
+                       $title = db_fetch_result($result, 0, "title");
+                       $feed_url = db_fetch_result($result, 0, "feed_url");
+
+                       $content = sanitize($this->link,
+                               db_fetch_result($result, 0, "content"), false, false, $feed_url);
+
+                       print "<div class='content'>".$content."</content>";
+
+               } else {
+                       print "Article not found.";
+               }
+
+       }
+
 }
 ?>
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/