]> git.wh0rd.org - tt-rss.git/blobdiff - classes/rpc.php
pngcrush.sh
[tt-rss.git] / classes / rpc.php
old mode 100644 (file)
new mode 100755 (executable)
index c46d61d..bd4337f
@@ -2,63 +2,68 @@
 class RPC extends Handler_Protected {
 
        function csrf_ignore($method) {
-               $csrf_ignored = array("sanitycheck", "completelabels");
+               $csrf_ignored = array("sanitycheck", "completelabels", "saveprofile");
 
                return array_search($method, $csrf_ignored) !== false;
        }
 
        function setprofile() {
-               $id = db_escape_string( $_REQUEST["id"]);
+               $_SESSION["profile"] = clean($_REQUEST["id"]);
 
-               $_SESSION["profile"] = $id;
-               $_SESSION["prefs_cache"] = array();
+               // default value
+               if (!$_SESSION["profile"]) $_SESSION["profile"] = null;
        }
 
        function remprofiles() {
-               $ids = explode(",", db_escape_string( trim($_REQUEST["ids"])));
+               $ids = explode(",", trim(clean($_REQUEST["ids"])));
 
                foreach ($ids as $id) {
                        if ($_SESSION["profile"] != $id) {
-                               db_query( "DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
-                                                       owner_uid = " . $_SESSION["uid"]);
+                               $sth = $this->pdo->prepare("DELETE FROM ttrss_settings_profiles WHERE id = ? AND
+                                                       owner_uid = ?");
+                               $sth->execute([$id, $_SESSION['uid']]);
                        }
                }
        }
 
        // Silent
        function addprofile() {
-               $title = db_escape_string( trim($_REQUEST["title"]));
+               $title = trim(clean($_REQUEST["title"]));
+
                if ($title) {
-                       db_query( "BEGIN");
+                       $this->pdo->beginTransaction();
+
+                       $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
+                               WHERE title = ? AND owner_uid = ?");
+                       $sth->execute([$title, $_SESSION['uid']]);
 
-                       $result = db_query( "SELECT id FROM ttrss_settings_profiles
-                               WHERE title = '$title' AND owner_uid = " . $_SESSION["uid"]);
+                       if (!$sth->fetch()) {
 
-                       if (db_num_rows($result) == 0) {
+                               $sth = $this->pdo->prepare("INSERT INTO ttrss_settings_profiles (title, owner_uid)
+                                                       VALUES (?, ?)");
 
-                               db_query( "INSERT INTO ttrss_settings_profiles (title, owner_uid)
-                                                       VALUES ('$title', ".$_SESSION["uid"] .")");
+                               $sth->execute([$title, $_SESSION['uid']]);
 
-                               $result = db_query( "SELECT id FROM ttrss_settings_profiles WHERE
-                                       title = '$title'");
+                               $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles WHERE
+                                       title = ? AND owner_uid = ?");
+                               $sth->execute([$title, $_SESSION['uid']]);
 
-                               if (db_num_rows($result) != 0) {
-                                       $profile_id = db_fetch_result($result, 0, "id");
+                               if ($row = $sth->fetch()) {
+                                       $profile_id = $row['id'];
 
                                        if ($profile_id) {
-                                               initialize_user_prefs( $_SESSION["uid"], $profile_id);
+                                               initialize_user_prefs($_SESSION["uid"], $profile_id);
                                        }
                                }
                        }
 
-                       db_query( "COMMIT");
+                       $this->pdo->commit();
                }
        }
 
-       // Silent
        function saveprofile() {
-               $id = db_escape_string( $_REQUEST["id"]);
-               $title = db_escape_string( trim($_REQUEST["value"]));
+               $id = clean($_REQUEST["id"]);
+               $title = trim(clean($_REQUEST["value"]));
 
                if ($id == 0) {
                        print __("Default profile");
@@ -66,236 +71,214 @@ class RPC extends Handler_Protected {
                }
 
                if ($title) {
-                       db_query( "BEGIN");
+                       $sth = $this->pdo->prepare("UPDATE ttrss_settings_profiles
+                               SET title = ? WHERE id = ? AND
+                                       owner_uid = ?");
 
-                       $result = db_query( "SELECT id FROM ttrss_settings_profiles
-                               WHERE title = '$title' AND owner_uid =" . $_SESSION["uid"]);
-
-                       if (db_num_rows($result) == 0) {
-                               db_query( "UPDATE ttrss_settings_profiles
-                                                       SET title = '$title' WHERE id = '$id' AND
-                                                       owner_uid = " . $_SESSION["uid"]);
-                               print $title;
-                       } else {
-                               $result = db_query( "SELECT title FROM ttrss_settings_profiles
-                                                       WHERE id = '$id' AND owner_uid =" . $_SESSION["uid"]);
-                               print db_fetch_result($result, 0, "title");
-                       }
-
-                       db_query( "COMMIT");
+                       $sth->execute([$title, $id, $_SESSION['uid']]);
+                       print $title;
                }
        }
 
        // Silent
        function remarchive() {
-               $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+               $ids = explode(",", clean($_REQUEST["ids"]));
 
-               foreach ($ids as $id) {
-                       $result = db_query( "DELETE FROM ttrss_archived_feeds WHERE
-               (SELECT COUNT(*) FROM ttrss_user_entries
-                                                       WHERE orig_feed_id = '$id') = 0 AND
-               id = '$id' AND owner_uid = ".$_SESSION["uid"]);
+               $sth = $this->pdo->prepare("DELETE FROM ttrss_archived_feeds WHERE
+                               (SELECT COUNT(*) FROM ttrss_user_entries
+                                       WHERE orig_feed_id = :id) = 0 AND
+                                               id = :id AND owner_uid = :uid");
 
-                       $rc = db_affected_rows( $result);
+               foreach ($ids as $id) {
+                       $sth->execute([":id" => $id, ":uid" => $_SESSION['uid']]);
                }
        }
 
        function addfeed() {
-               $feed = db_escape_string( $_REQUEST['feed']);
-               $cat = db_escape_string( $_REQUEST['cat']);
-               $login = db_escape_string( $_REQUEST['login']);
-               $pass = trim($_REQUEST['pass']); // escaped later
+               $feed = clean($_REQUEST['feed']);
+               $cat = clean($_REQUEST['cat']);
+               $need_auth = isset($_REQUEST['need_auth']);
+               $login = $need_auth ? clean($_REQUEST['login']) : '';
+               $pass = $need_auth ? trim(clean($_REQUEST['pass'])) : '';
 
-               $rc = subscribe_to_feed( $feed, $cat, $login, $pass);
+               $rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass);
 
                print json_encode(array("result" => $rc));
        }
 
        function togglepref() {
-               $key = db_escape_string( $_REQUEST["key"]);
-               set_pref( $key, !get_pref( $key));
-               $value = get_pref( $key);
+               $key = clean($_REQUEST["key"]);
+               set_pref($key, !get_pref($key));
+               $value = get_pref($key);
 
                print json_encode(array("param" =>$key, "value" => $value));
        }
 
        function setpref() {
                // set_pref escapes input, so no need to double escape it here
-               $key = $_REQUEST['key'];
-               $value = str_replace("\n", "<br/>", $_REQUEST['value']);
+               $key = clean($_REQUEST['key']);
+               $value = $_REQUEST['value'];
 
-               set_pref( $key, $value, $_SESSION['uid'], $key != 'USER_STYLESHEET');
+               set_pref($key, $value, false, $key != 'USER_STYLESHEET');
 
                print json_encode(array("param" =>$key, "value" => $value));
        }
 
        function mark() {
-               $mark = $_REQUEST["mark"];
-               $id = db_escape_string( $_REQUEST["id"]);
+               $mark = clean($_REQUEST["mark"]);
+               $id = clean($_REQUEST["id"]);
 
-               if ($mark == "1") {
-                       $mark = "true";
-               } else {
-                       $mark = "false";
-               }
-
-               $result = db_query( "UPDATE ttrss_user_entries SET marked = $mark,
+               $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET marked = ?,
                                        last_marked = NOW()
-                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                                       WHERE ref_id = ? AND owner_uid = ?");
+
+               $sth->execute([$mark, $id, $_SESSION['uid']]);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function delete() {
-               $ids = db_escape_string( $_REQUEST["ids"]);
+               $ids = explode(",", clean($_REQUEST["ids"]));
+               $ids_qmarks = arr_qmarks($ids);
 
-               $result = db_query( "DELETE FROM ttrss_user_entries
-               WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
+               $sth = $this->pdo->prepare("DELETE FROM ttrss_user_entries
+                       WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
+               $sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
-               purge_orphans();
+               Article::purge_orphans();
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function unarchive() {
-               $ids = explode(",", $_REQUEST["ids"]);
+               $ids = explode(",", clean($_REQUEST["ids"]));
 
                foreach ($ids as $id) {
-                       $id = db_escape_string( trim($id));
-                       db_query( "BEGIN");
-
-                       $result = db_query( "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"].")");
+                       $this->pdo->beginTransaction();
 
-                       if (db_num_rows($result) != 0) {
-                               $feed_url = db_escape_string( db_fetch_result($result, 0, "feed_url"));
-                               $site_url = db_escape_string( db_fetch_result($result, 0, "site_url"));
-                               $title = db_escape_string( db_fetch_result($result, 0, "title"));
+                       $sth = $this->pdo->prepare("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 = :uid) AND owner_uid = :uid");
+                       $sth->execute([":uid" => $_SESSION['uid'], ":id" => $id]);
 
-                               $result = db_query( "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
-                                       AND owner_uid = " .$_SESSION["uid"]);
+                       if ($row = $sth->fetch()) {
+                               $feed_url = $row['feed_url'];
+                               $site_url = $row['site_url'];
+                               $title = $row['title'];
 
-                               if (db_num_rows($result) == 0) {
+                               $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
+                                       AND owner_uid = ?");
+                               $sth->execute([$feed_url, $_SESSION['uid']]);
 
+                               if ($row = $sth->fetch()) {
+                                       $feed_id = $row["id"];
+                               } else {
                                        if (!$title) $title = '[Unknown]';
 
-                                       $result = db_query(
-                                               "INSERT INTO ttrss_feeds
+                                       $sth = $this->pdo->prepare("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(
-                                               "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");
-                                       }
+                                                       VALUES (?, ?, ?, ?, NULL, '', '', 0)");
+                                       $sth->execute([$_SESSION['uid'], $feed_url, $site_url, $title]);
 
-                               } else {
-                                       $feed_id = db_fetch_result($result, 0, "id");
+                                       $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
+                                               AND owner_uid = ?");
+                                       $sth->execute([$feed_url, $_SESSION['uid']]);
+
+                                       if ($row = $sth->fetch()) {
+                                               $feed_id = $row['id'];
+                                       }
                                }
 
                                if ($feed_id) {
-                                       $result = db_query( "UPDATE ttrss_user_entries
-                                               SET feed_id = '$feed_id', orig_feed_id = NULL
-                                               WHERE ref_id = $id AND owner_uid = " . $_SESSION["uid"]);
+                                       $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
+                                               SET feed_id = ?, orig_feed_id = NULL
+                                               WHERE ref_id = ? AND owner_uid = ?");
+                                       $sth->execute([$feed_id, $id, $_SESSION['uid']]);
                                }
                        }
 
-                       db_query( "COMMIT");
+                       $this->pdo->commit();
                }
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function archive() {
-               $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+               $ids = explode(",", clean($_REQUEST["ids"]));
 
                foreach ($ids as $id) {
-                       $this->archive_article( $id, $_SESSION["uid"]);
+                       $this->archive_article($id, $_SESSION["uid"]);
                }
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
-       private function archive_article( $id, $owner_uid) {
-               db_query( "BEGIN");
+       private function archive_article($id, $owner_uid) {
+               $this->pdo->beginTransaction();
 
-               $result = db_query( "SELECT feed_id FROM ttrss_user_entries
-                       WHERE ref_id = '$id' AND owner_uid = $owner_uid");
+               if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
-               if (db_num_rows($result) != 0) {
+               $sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
+                       WHERE ref_id = ? AND owner_uid = ?");
+               $sth->execute([$id, $owner_uid]);
+
+               if ($row = $sth->fetch()) {
 
                        /* prepare the archived table */
 
-                       $feed_id = (int) db_fetch_result($result, 0, "feed_id");
+                       $feed_id = (int) $row['feed_id'];
 
                        if ($feed_id) {
-                               $result = db_query( "SELECT id FROM ttrss_archived_feeds
-                                       WHERE id = '$feed_id'");
+                               $sth = $this->pdo->prepare("SELECT id FROM ttrss_archived_feeds
+                                       WHERE id = ? AND owner_uid = ?");
+                               $sth->execute([$feed_id, $owner_uid]);
+
+                               if ($row = $sth->fetch()) {
+                                       $new_feed_id = $row['id'];
+                               } else {
+                                       $row = $this->pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds")->fetch();
+                                       $new_feed_id = (int)$row['id'] + 1;
 
-                               if (db_num_rows($result) == 0) {
-                                       db_query( "INSERT INTO ttrss_archived_feeds
+                                       $sth = $this->pdo->prepare("INSERT INTO ttrss_archived_feeds
                                                (id, owner_uid, title, feed_url, site_url)
-                                       SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
-                                       WHERE id = '$feed_id'");
+                                                       SELECT ?, owner_uid, title, feed_url, site_url from ttrss_feeds
+                                                               WHERE id = ?");
+
+                                       $sth->execute([$new_feed_id, $feed_id]);
                                }
 
-                               db_query( "UPDATE ttrss_user_entries
-                                       SET orig_feed_id = feed_id, feed_id = NULL
-                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                               $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
+                                       SET orig_feed_id = ?, feed_id = NULL
+                                       WHERE ref_id = ? AND owner_uid = ?");
+                               $sth->execute([$new_feed_id, $id, $owner_uid]);
                        }
                }
 
-               db_query( "COMMIT");
+               $this->pdo->commit();
        }
 
        function publ() {
-               $pub = $_REQUEST["pub"];
-               $id = db_escape_string( $_REQUEST["id"]);
-               $note = trim(strip_tags(db_escape_string( $_REQUEST["note"])));
-
-               if ($pub == "1") {
-                       $pub = "true";
-               } else {
-                       $pub = "false";
-               }
-
-               $result = db_query( "UPDATE ttrss_user_entries SET
-                       published = $pub, last_published = NOW()
-                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+               $pub = clean($_REQUEST["pub"]);
+               $id = clean($_REQUEST["id"]);
 
-               $pubsub_result = false;
+               $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+                       published = ?, last_published = NOW()
+                       WHERE ref_id = ? AND owner_uid = ?");
 
-               if (PUBSUBHUBBUB_HUB) {
-                       $rss_link = get_self_url_prefix() .
-                               "/public.php?op=rss&id=-2&key=" .
-                               get_feed_access_key( -2, false);
+               $sth->execute([$pub, $id, $_SESSION['uid']]);
 
-                       $p = new Publisher(PUBSUBHUBBUB_HUB);
-
-                       $pubsub_result = $p->publish_update($rss_link);
-               }
-
-               print json_encode(array("message" => "UPDATE_COUNTERS",
-                       "pubsub_result" => $pubsub_result));
+               print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function getAllCounters() {
-               $last_article_id = (int) $_REQUEST["last_article_id"];
+               $last_article_id = (int) clean($_REQUEST["last_article_id"]);
 
                $reply = array();
 
-               if ($seq) $reply['seq'] = $seq;
+               if (!empty($_REQUEST['seq'])) $reply['seq'] = (int) $_REQUEST['seq'];
 
-               if ($last_article_id != getLastArticleId()) {
-                       $reply['counters'] = getAllCounters();
+               if ($last_article_id != Article::getLastArticleId()) {
+                       $reply['counters'] = Counters::getAllCounters();
                }
 
                $reply['runtime-info'] = make_runtime_info();
@@ -305,36 +288,37 @@ 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"]));
-               $cmode = sprintf("%d", $_REQUEST["cmode"]);
+               $ids = explode(",", clean($_REQUEST["ids"]));
+               $cmode = sprintf("%d", clean($_REQUEST["cmode"]));
 
-               catchupArticlesById( $ids, $cmode);
+               Article::catchupArticlesById($ids, $cmode);
 
                print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
        }
 
        function markSelected() {
-               $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
-               $cmode = sprintf("%d", $_REQUEST["cmode"]);
+               $ids = explode(",", clean($_REQUEST["ids"]));
+               $cmode = (int)clean($_REQUEST["cmode"]);
 
-               $this->markArticlesById( $ids, $cmode);
+               $this->markArticlesById($ids, $cmode);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function publishSelected() {
-               $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
-               $cmode = sprintf("%d", $_REQUEST["cmode"]);
+               $ids = explode(",", clean($_REQUEST["ids"]));
+               $cmode = (int)clean($_REQUEST["cmode"]);
 
-               $this->publishArticlesById( $ids, $cmode);
+               $this->publishArticlesById($ids, $cmode);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function sanityCheck() {
-               $_SESSION["hasAudio"] = $_REQUEST["hasAudio"] === "true";
-               $_SESSION["hasSandbox"] = $_REQUEST["hasSandbox"] === "true";
-               $_SESSION["hasMp3"] = $_REQUEST["hasMp3"] === "true";
+               $_SESSION["hasAudio"] = clean($_REQUEST["hasAudio"]) === "true";
+               $_SESSION["hasSandbox"] = clean($_REQUEST["hasSandbox"]) === "true";
+               $_SESSION["hasMp3"] = clean($_REQUEST["hasMp3"]) === "true";
+               $_SESSION["clientTzOffset"] = clean($_REQUEST["clientTzOffset"]);
 
                $reply = array();
 
@@ -342,98 +326,91 @@ class RPC extends Handler_Protected {
 
                if ($reply['error']['code'] == 0) {
                        $reply['init-params'] = make_init_params();
-                       $reply['runtime-info'] = make_runtime_info();
+                       $reply['runtime-info'] = make_runtime_info(true);
                }
 
                print json_encode($reply);
        }
 
        function completeLabels() {
-               $search = db_escape_string( $_REQUEST["search"]);
+               $search = clean($_REQUEST["search"]);
 
-               $result = db_query( "SELECT DISTINCT caption FROM
+               $sth = $this->pdo->prepare("SELECT DISTINCT caption FROM
                                ttrss_labels2
-                               WHERE owner_uid = '".$_SESSION["uid"]."' AND
-                               LOWER(caption) LIKE LOWER('$search%') ORDER BY caption
+                               WHERE owner_uid = ? AND
+                               LOWER(caption) LIKE LOWER(?) ORDER BY caption
                                LIMIT 5");
+               $sth->execute([$_SESSION['uid'], "%$search%"]);
 
                print "<ul>";
-               while ($line = db_fetch_assoc($result)) {
+               while ($line = $sth->fetch()) {
                        print "<li>" . $line["caption"] . "</li>";
                }
                print "</ul>";
        }
 
-       function purge() {
-               $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
-               $days = sprintf("%d", $_REQUEST["days"]);
-
-               foreach ($ids as $id) {
-
-                       $result = db_query( "SELECT id FROM ttrss_feeds WHERE
-                               id = '$id' AND owner_uid = ".$_SESSION["uid"]);
-
-                       if (db_num_rows($result) == 1) {
-                               purge_feed( $id, $days);
-                       }
-               }
-       }
-
        function updateFeedBrowser() {
-               $search = db_escape_string( $_REQUEST["search"]);
-               $limit = db_escape_string( $_REQUEST["limit"]);
-               $mode = (int) db_escape_string( $_REQUEST["mode"]);
+               if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
+
+               $search = clean($_REQUEST["search"]);
+               $limit = clean($_REQUEST["limit"]);
+               $mode = (int) clean($_REQUEST["mode"]);
 
                require_once "feedbrowser.php";
 
                print json_encode(array("content" =>
-                       make_feed_browser( $search, $limit, $mode),
+                       make_feed_browser($search, $limit, $mode),
                                "mode" => $mode));
        }
 
        // Silent
        function massSubscribe() {
 
-               $payload = json_decode($_REQUEST["payload"], false);
-               $mode = $_REQUEST["mode"];
+               $payload = json_decode(clean($_REQUEST["payload"]), false);
+               $mode = clean($_REQUEST["mode"]);
 
                if (!$payload || !is_array($payload)) return;
 
                if ($mode == 1) {
                        foreach ($payload as $feed) {
 
-                               $title = db_escape_string( $feed[0]);
-                               $feed_url = db_escape_string( $feed[1]);
+                               $title = $feed[0];
+                               $feed_url = $feed[1];
 
-                               $result = db_query( "SELECT id FROM ttrss_feeds WHERE
-                                       feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
+                               $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                                       feed_url = ? AND owner_uid = ?");
+                               $sth->execute([$feed_url, $_SESSION['uid']]);
 
-                               if (db_num_rows($result) == 0) {
-                                       $result = db_query( "INSERT INTO ttrss_feeds
+                               if (!$sth->fetch()) {
+                                       $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
                                                                        (owner_uid,feed_url,title,cat_id,site_url)
-                                                                       VALUES ('".$_SESSION["uid"]."',
-                                                                       '$feed_url', '$title', NULL, '')");
+                                                                       VALUES (?, ?, ?, NULL, '')");
+
+                                       $sth->execute([$_SESSION['uid'], $feed_url, $title]);
                                }
                        }
                } else if ($mode == 2) {
                        // feed archive
                        foreach ($payload as $id) {
-                               $result = db_query( "SELECT * FROM ttrss_archived_feeds
-                                       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"));
-
-                                       $result = db_query( "SELECT id FROM ttrss_feeds WHERE
-                                               feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
-
-                                       if (db_num_rows($result) == 0) {
-                                               $result = db_query( "INSERT INTO ttrss_feeds
-                                                                               (owner_uid,feed_url,title,cat_id,site_url)
-                                                                       VALUES ('$id','".$_SESSION["uid"]."',
-                                                                       '$feed_url', '$title', NULL, '$site_url')");
+                               $sth = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
+                                       WHERE id = ? AND owner_uid = ?");
+                               $sth->execute([$id, $_SESSION['uid']]);
+
+                               if ($row = $sth->fetch()) {
+                                       $site_url = $row['site_url'];
+                                       $feed_url = $row['feed_url'];
+                                       $title = $row['title'];
+
+                                       $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                                               feed_url = ? AND owner_uid = ?");
+                                       $sth->execute([$feed_url, $_SESSION['uid']]);
+
+                                       if (!$sth->fetch()) {
+                                               $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                                                               (owner_uid,feed_url,title,cat_id,site_url)
+                                                                       VALUES (?, ?, ?, NULL, ?)");
+
+                                               $sth->execute([$_SESSION['uid'], $feed_url, $title, $site_url]);
                                        }
                                }
                        }
@@ -441,50 +418,28 @@ class RPC extends Handler_Protected {
        }
 
        function catchupFeed() {
-               $feed_id = db_escape_string( $_REQUEST['feed_id']);
-               $is_cat = db_escape_string( $_REQUEST['is_cat']) == "true";
-               $mode = db_escape_string( $_REQUEST['mode']);
+               $feed_id = clean($_REQUEST['feed_id']);
+               $is_cat = clean($_REQUEST['is_cat']) == "true";
+               $mode = clean($_REQUEST['mode']);
+               $search_query = clean($_REQUEST['search_query']);
+               $search_lang = clean($_REQUEST['search_lang']);
 
-               catchup_feed( $feed_id, $is_cat, false, false, $mode);
+               Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
-       function quickAddCat() {
-               $cat = db_escape_string( $_REQUEST["cat"]);
-
-               add_feed_category( $cat);
-
-               $result = db_query( "SELECT id FROM ttrss_feed_categories WHERE
-                       title = '$cat' AND owner_uid = " . $_SESSION["uid"]);
-
-               if (db_num_rows($result) == 1) {
-                       $id = db_fetch_result($result, 0, "id");
-               } else {
-                       $id = 0;
-               }
-
-               print_feed_cat_select( "cat_id", $id);
-       }
-
-       // Silent
-       function clearArticleKeys() {
-               db_query( "UPDATE ttrss_user_entries SET uuid = '' WHERE
-                       owner_uid = " . $_SESSION["uid"]);
-
-               return;
-       }
-
        function setpanelmode() {
-               $wide = (int) $_REQUEST["wide"];
+               $wide = (int) clean($_REQUEST["wide"]);
 
                setcookie("ttrss_widescreen", $wide,
-                       time() + SESSION_COOKIE_LIFETIME);
+                       time() + COOKIE_LIFETIME_LONG);
 
                print json_encode(array("wide" => $wide));
        }
 
-       function updaterandomfeed() {
+       static function updaterandomfeed_real() {
+
                // Test if the feed need a update (update interval exceded).
                if (DB_TYPE == "pgsql") {
                        $update_limit_qpart = "AND ((
@@ -515,31 +470,37 @@ class RPC extends Handler_Protected {
 
                $random_qpart = sql_random_function();
 
+               $pdo = Db::pdo();
+
+               // we could be invoked from public.php with no active session
+               if ($_SESSION["uid"]) {
+                       $owner_check_qpart = "AND ttrss_feeds.owner_uid = ".$pdo->quote($_SESSION["uid"]);
+               } else {
+                       $owner_check_qpart = "";
+               }
+
                // We search for feed needing update.
-               $result = db_query( "SELECT ttrss_feeds.feed_url,ttrss_feeds.id
+               $res = $pdo->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
                        FROM
                                ttrss_feeds, ttrss_users, ttrss_user_prefs
                        WHERE
                                ttrss_feeds.owner_uid = ttrss_users.id
                                AND ttrss_users.id = ttrss_user_prefs.owner_uid
                                AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
-                               AND ttrss_feeds.owner_uid = ".$_SESSION["uid"]."
-                               $update_limit_qpart $updstart_thresh_qpart
+                               $owner_check_qpart
+                               $update_limit_qpart
+                               $updstart_thresh_qpart
                        ORDER BY $random_qpart LIMIT 30");
 
-               $feed_id = -1;
-
-               require_once "rssfuncs.php";
-
                $num_updated = 0;
 
                $tstart = time();
 
-               while ($line = db_fetch_assoc($result)) {
+               while ($line = $res->fetch()) {
                        $feed_id = $line["id"];
 
                        if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
-                               update_rss_feed( $feed_id, true);
+                               RSSUtils::update_rss_feed($feed_id, true);
                                ++$num_updated;
                        } else {
                                break;
@@ -547,8 +508,8 @@ class RPC extends Handler_Protected {
                }
 
                // Purge orphans and cleanup tags
-               purge_orphans();
-               cleanup_tags( 14, 50000);
+               Article::purge_orphans();
+               //cleanup_tags(14, 50000);
 
                if ($num_updated > 0) {
                        print json_encode(array("message" => "UPDATE_COUNTERS",
@@ -559,75 +520,62 @@ class RPC extends Handler_Protected {
 
        }
 
-       private function markArticlesById( $ids, $cmode) {
+       function updaterandomfeed() {
+               RPC::updaterandomfeed_real();
+       }
 
-               $tmp_ids = array();
+       private function markArticlesById($ids, $cmode) {
 
-               foreach ($ids as $id) {
-                       array_push($tmp_ids, "ref_id = '$id'");
-               }
-
-               $ids_qpart = join(" OR ", $tmp_ids);
+               $ids_qmarks = arr_qmarks($ids);
 
                if ($cmode == 0) {
-                       db_query( "UPDATE ttrss_user_entries SET
-                       marked = false, last_marked = NOW()
-                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+                       $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+                               marked = false, last_marked = NOW()
+                                       WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
                } else if ($cmode == 1) {
-                       db_query( "UPDATE ttrss_user_entries SET
-                       marked = true, last_marked = NOW()
-                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+                       $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+                               marked = true, last_marked = NOW()
+                                       WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
                } else {
-                       db_query( "UPDATE ttrss_user_entries SET
-                       marked = NOT marked,last_marked = NOW()
-                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+                       $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+                               marked = NOT marked,last_marked = NOW()
+                                       WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
                }
-       }
 
-       private function publishArticlesById( $ids, $cmode) {
+               $sth->execute(array_merge($ids, [$_SESSION['uid']]));
+       }
 
-               $tmp_ids = array();
+       private function publishArticlesById($ids, $cmode) {
 
-               foreach ($ids as $id) {
-                       array_push($tmp_ids, "ref_id = '$id'");
-               }
-
-               $ids_qpart = join(" OR ", $tmp_ids);
+               $ids_qmarks = arr_qmarks($ids);
 
                if ($cmode == 0) {
-                       db_query( "UPDATE ttrss_user_entries SET
-                       published = false,last_published = NOW()
-                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+                       $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+                               published = false, last_published = NOW()
+                                       WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
                } else if ($cmode == 1) {
-                       db_query( "UPDATE ttrss_user_entries SET
-                       published = true,last_published = NOW()
-                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+                       $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+                               published = true, last_published = NOW()
+                                       WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
                } else {
-                       db_query( "UPDATE ttrss_user_entries SET
-                       published = NOT published,last_published = NOW()
-                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+                       $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+                               published = NOT published,last_published = NOW()
+                                       WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
                }
 
-               if (PUBSUBHUBBUB_HUB) {
-                       $rss_link = get_self_url_prefix() .
-                               "/public.php?op=rss&id=-2&key=" .
-                               get_feed_access_key( -2, false);
-
-                       $p = new Publisher(PUBSUBHUBBUB_HUB);
-
-                       $pubsub_result = $p->publish_update($rss_link);
-               }
+               $sth->execute(array_merge($ids, [$_SESSION['uid']]));
        }
 
        function getlinktitlebyid() {
-               $id = db_escape_string( $_REQUEST['id']);
+               $id = clean($_REQUEST['id']);
 
-               $result = db_query( "SELECT link, title FROM ttrss_entries, ttrss_user_entries
-                       WHERE ref_id = '$id' AND ref_id = id AND owner_uid = ". $_SESSION["uid"]);
+               $sth = $this->pdo->prepare("SELECT link, title FROM ttrss_entries, ttrss_user_entries
+                       WHERE ref_id = ? AND ref_id = id AND owner_uid = ?");
+               $sth->execute([$id, $_SESSION['uid']]);
 
-               if (db_num_rows($result) != 0) {
-                       $link = db_fetch_result($result, 0, "link");
-                       $title = db_fetch_result($result, 0, "title");
+               if ($row = $sth->fetch()) {
+                       $link = $row['link'];
+                       $title = $row['title'];
 
                        echo json_encode(array("link" => $link, "title" => $title));
                } else {
@@ -635,5 +583,20 @@ class RPC extends Handler_Protected {
                }
        }
 
-}
-?>
+       function log() {
+               $msg = clean($_REQUEST['msg']);
+               $file = basename(clean($_REQUEST['file']));
+               $line = (int) clean($_REQUEST['line']);
+               $context = clean($_REQUEST['context']);
+
+               if ($msg) {
+                       Logger::get()->log_error(E_USER_WARNING,
+                               $msg, 'client-js:' . $file, $line, $context);
+
+                       echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
+               } else {
+                       echo json_encode(array("error" => "MESSAGE_NOT_FOUND"));
+               }
+
+       }
+}
\ No newline at end of file