move the following to Feeds:

[tt-rss.git] / classes / rpc.php

diff --git a/classes/rpc.php b/classes/rpc.php
index fd10a3a496b70d0a859333e746e84d0fe725a641..f82f1ef32e4724fa43dadf29d85d6d378268525d 100755 (executable)
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -105,7 +105,7 @@ class RPC extends Handler_Protected {
                $login = $this->dbh->escape_string($_REQUEST['login']);
                $pass = trim($_REQUEST['pass']); // escaped later
 
-               $rc = subscribe_to_feed($feed, $cat, $login, $pass);
+               $rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass);
 
                print json_encode(array("result" => $rc));
        }
@@ -450,8 +450,10 @@ class RPC extends Handler_Protected {
                $feed_id = $this->dbh->escape_string($_REQUEST['feed_id']);
                $is_cat = $this->dbh->escape_string($_REQUEST['is_cat']) == "true";
                $mode = $this->dbh->escape_string($_REQUEST['mode']);
+               $search_query = $this->dbh->escape_string($_REQUEST['search_query']);
+               $search_lang = $this->dbh->escape_string($_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"));
        }
@@ -662,5 +664,4 @@ class RPC extends Handler_Protected {
                }
 
        }
-}
-?>
+}
\ No newline at end of file