]> git.wh0rd.org - tt-rss.git/blobdiff - classes/rpc.php
remove $link
[tt-rss.git] / classes / rpc.php
index 88c6f1ddc81a2b78e5fcf650a5d45ca2a6204351..c46d61d3072772c24e7b63eebee3af4828aeb841 100644 (file)
 class RPC extends Handler_Protected {
 
        function csrf_ignore($method) {
-               $csrf_ignored = array("sanitycheck", "buttonplugin", "exportget", "completelabels");
+               $csrf_ignored = array("sanitycheck", "completelabels");
 
                return array_search($method, $csrf_ignored) !== false;
        }
 
        function setprofile() {
-               $id = db_escape_string($_REQUEST["id"]);
+               $id = db_escape_string( $_REQUEST["id"]);
 
                $_SESSION["profile"] = $id;
                $_SESSION["prefs_cache"] = array();
        }
 
-       function exportget() {
-               $exportname = CACHE_DIR . "/export/" .
-                       sha1($_SESSION['uid'] . $_SESSION['login']) . ".xml";
-
-               if (file_exists($exportname)) {
-                       header("Content-type: text/xml");
-
-                       if (function_exists('gzencode')) {
-                               header("Content-Disposition: attachment; filename=TinyTinyRSS_exported.xml.gz");
-                               echo gzencode(file_get_contents($exportname));
-                       } else {
-                               header("Content-Disposition: attachment; filename=TinyTinyRSS_exported.xml");
-                               echo file_get_contents($exportname);
-                       }
-               } else {
-                       echo "File not found.";
-               }
-       }
-
-       function exportrun() {
-               $offset = (int) db_escape_string($_REQUEST['offset']);
-               $exported = 0;
-               $limit = 250;
-
-               if ($offset < 10000 && is_writable(CACHE_DIR . "/export")) {
-                       $result = db_query($this->link, "SELECT
-                                       ttrss_entries.guid,
-                                       ttrss_entries.title,
-                                       content,
-                                       marked,
-                                       published,
-                                       score,
-                                       note,
-                                       link,
-                                       tag_cache,
-                                       label_cache,
-                                       ttrss_feeds.title AS feed_title,
-                                       ttrss_feeds.feed_url AS feed_url,
-                                       ttrss_entries.updated
-                               FROM
-                                       ttrss_user_entries LEFT JOIN ttrss_feeds ON (ttrss_feeds.id = feed_id),
-                                       ttrss_entries
-                               WHERE
-                                       (marked = true OR feed_id IS NULL) AND
-                                       ref_id = ttrss_entries.id AND
-                                       ttrss_user_entries.owner_uid = " . $_SESSION['uid'] . "
-                               ORDER BY ttrss_entries.id LIMIT $limit OFFSET $offset");
-
-                       $exportname = sha1($_SESSION['uid'] . $_SESSION['login']);
-
-                       if ($offset == 0) {
-                               $fp = fopen(CACHE_DIR . "/export/$exportname.xml", "w");
-                               fputs($fp, "<articles schema-version=\"".SCHEMA_VERSION."\">");
-                       } else {
-                               $fp = fopen(CACHE_DIR . "/export/$exportname.xml", "a");
-                       }
-
-                       if ($fp) {
-
-                               while ($line = db_fetch_assoc($result)) {
-                                       fputs($fp, "<article>");
-
-                                       foreach ($line as $k => $v) {
-                                               fputs($fp, "<$k><![CDATA[$v]]></$k>");
-                                       }
-
-                                       fputs($fp, "</article>");
-                               }
-
-                               $exported = db_num_rows($result);
-
-                               if ($exported < $limit && $exported > 0) {
-                                       fputs($fp, "</articles>");
-                               }
-
-                               fclose($fp);
-                       }
-
-               }
-
-               print json_encode(array("exported" => $exported));
-       }
-
        function remprofiles() {
-               $ids = explode(",", db_escape_string(trim($_REQUEST["ids"])));
+               $ids = explode(",", db_escape_string( trim($_REQUEST["ids"])));
 
                foreach ($ids as $id) {
                        if ($_SESSION["profile"] != $id) {
-                               db_query($this->link, "DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
+                               db_query( "DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
                                                        owner_uid = " . $_SESSION["uid"]);
                        }
                }
@@ -110,38 +27,38 @@ class RPC extends Handler_Protected {
 
        // Silent
        function addprofile() {
-               $title = db_escape_string(trim($_REQUEST["title"]));
+               $title = db_escape_string( trim($_REQUEST["title"]));
                if ($title) {
-                       db_query($this->link, "BEGIN");
+                       db_query( "BEGIN");
 
-                       $result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
+                       $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($this->link, "INSERT INTO ttrss_settings_profiles (title, owner_uid)
+                               db_query( "INSERT INTO ttrss_settings_profiles (title, owner_uid)
                                                        VALUES ('$title', ".$_SESSION["uid"] .")");
 
-                               $result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles WHERE
+                               $result = db_query( "SELECT id FROM ttrss_settings_profiles WHERE
                                        title = '$title'");
 
                                if (db_num_rows($result) != 0) {
                                        $profile_id = db_fetch_result($result, 0, "id");
 
                                        if ($profile_id) {
-                                               initialize_user_prefs($this->link, $_SESSION["uid"], $profile_id);
+                                               initialize_user_prefs( $_SESSION["uid"], $profile_id);
                                        }
                                }
                        }
 
-                       db_query($this->link, "COMMIT");
+                       db_query( "COMMIT");
                }
        }
 
        // Silent
        function saveprofile() {
-               $id = db_escape_string($_REQUEST["id"]);
-               $title = db_escape_string(trim($_REQUEST["value"]));
+               $id = db_escape_string( $_REQUEST["id"]);
+               $title = db_escape_string( trim($_REQUEST["value"]));
 
                if ($id == 0) {
                        print __("Default profile");
@@ -149,56 +66,55 @@ class RPC extends Handler_Protected {
                }
 
                if ($title) {
-                       db_query($this->link, "BEGIN");
+                       db_query( "BEGIN");
 
-                       $result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
+                       $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($this->link, "UPDATE ttrss_settings_profiles
+                               db_query( "UPDATE ttrss_settings_profiles
                                                        SET title = '$title' WHERE id = '$id' AND
                                                        owner_uid = " . $_SESSION["uid"]);
                                print $title;
                        } else {
-                               $result = db_query($this->link, "SELECT title FROM ttrss_settings_profiles
+                               $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($this->link, "COMMIT");
+                       db_query( "COMMIT");
                }
        }
 
        // Silent
        function remarchive() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
                foreach ($ids as $id) {
-                       $result = db_query($this->link, "DELETE FROM ttrss_archived_feeds WHERE
+                       $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"]);
 
-                       $rc = db_affected_rows($this->link, $result);
+                       $rc = db_affected_rows( $result);
                }
        }
 
        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( $_REQUEST['feed']);
+               $cat = db_escape_string( $_REQUEST['cat']);
+               $login = db_escape_string( $_REQUEST['login']);
+               $pass = trim($_REQUEST['pass']); // escaped later
 
-               $rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass, $need_auth);
+               $rc = subscribe_to_feed( $feed, $cat, $login, $pass);
 
                print json_encode(array("result" => $rc));
        }
 
        function togglepref() {
-               $key = db_escape_string($_REQUEST["key"]);
-               set_pref($this->link, $key, !get_pref($this->link, $key));
-               $value = get_pref($this->link, $key);
+               $key = db_escape_string( $_REQUEST["key"]);
+               set_pref( $key, !get_pref( $key));
+               $value = get_pref( $key);
 
                print json_encode(array("param" =>$key, "value" => $value));
        }
@@ -208,14 +124,14 @@ class RPC extends Handler_Protected {
                $key = $_REQUEST['key'];
                $value = str_replace("\n", "<br/>", $_REQUEST['value']);
 
-               set_pref($this->link, $key, $value, $_SESSION['uid'], $key != 'USER_STYLESHEET');
+               set_pref( $key, $value, $_SESSION['uid'], $key != 'USER_STYLESHEET');
 
                print json_encode(array("param" =>$key, "value" => $value));
        }
 
        function mark() {
                $mark = $_REQUEST["mark"];
-               $id = db_escape_string($_REQUEST["id"]);
+               $id = db_escape_string( $_REQUEST["id"]);
 
                if ($mark == "1") {
                        $mark = "true";
@@ -223,45 +139,127 @@ class RPC extends Handler_Protected {
                        $mark = "false";
                }
 
-               $result = db_query($this->link, "UPDATE ttrss_user_entries SET marked = $mark
+               $result = db_query( "UPDATE ttrss_user_entries SET marked = $mark,
+                                       last_marked = NOW()
                                        WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function delete() {
-               $ids = db_escape_string($_REQUEST["ids"]);
+               $ids = db_escape_string( $_REQUEST["ids"]);
 
-               $result = db_query($this->link, "DELETE FROM ttrss_user_entries
+               $result = db_query( "DELETE FROM ttrss_user_entries
                WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
+               purge_orphans();
+
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function unarchive() {
-               $ids = db_escape_string($_REQUEST["ids"]);
+               $ids = explode(",", $_REQUEST["ids"]);
 
-               $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"]);
+               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"].")");
+
+                       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"));
+
+                               $result = db_query( "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(
+                                               "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");
+                                       }
+
+                               } else {
+                                       $feed_id = db_fetch_result($result, 0, "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"]);
+                               }
+                       }
+
+                       db_query( "COMMIT");
+               }
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function archive() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
                foreach ($ids as $id) {
-                       archive_article($this->link, $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");
+
+               $result = db_query( "SELECT feed_id FROM ttrss_user_entries
+                       WHERE ref_id = '$id' AND owner_uid = $owner_uid");
+
+               if (db_num_rows($result) != 0) {
+
+                       /* prepare the archived table */
+
+                       $feed_id = (int) db_fetch_result($result, 0, "feed_id");
+
+                       if ($feed_id) {
+                               $result = db_query( "SELECT id FROM ttrss_archived_feeds
+                                       WHERE id = '$feed_id'");
+
+                               if (db_num_rows($result) == 0) {
+                                       db_query( "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'");
+                               }
+
+                               db_query( "UPDATE ttrss_user_entries
+                                       SET orig_feed_id = feed_id, feed_id = NULL
+                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                       }
+               }
+
+               db_query( "COMMIT");
+       }
+
        function publ() {
                $pub = $_REQUEST["pub"];
-               $id = db_escape_string($_REQUEST["id"]);
-               $note = trim(strip_tags(db_escape_string($_REQUEST["note"])));
+               $id = db_escape_string( $_REQUEST["id"]);
+               $note = trim(strip_tags(db_escape_string( $_REQUEST["note"])));
 
                if ($pub == "1") {
                        $pub = "true";
@@ -269,8 +267,8 @@ class RPC extends Handler_Protected {
                        $pub = "false";
                }
 
-               $result = db_query($this->link, "UPDATE ttrss_user_entries SET
-                       published = $pub, last_read = NOW()
+               $result = db_query( "UPDATE ttrss_user_entries SET
+                       published = $pub, last_published = NOW()
                        WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
                $pubsub_result = false;
@@ -278,7 +276,7 @@ class RPC extends Handler_Protected {
                if (PUBSUBHUBBUB_HUB) {
                        $rss_link = get_self_url_prefix() .
                                "/public.php?op=rss&id=-2&key=" .
-                               get_feed_access_key($this->link, -2, false);
+                               get_feed_access_key( -2, false);
 
                        $p = new Publisher(PUBSUBHUBBUB_HUB);
 
@@ -294,142 +292,66 @@ class RPC extends Handler_Protected {
 
                $reply = array();
 
-                if ($seq) $reply['seq'] = $seq;
-
-                if ($last_article_id != getLastArticleId($this->link)) {
-                               $omode = $_REQUEST["omode"];
+               if ($seq) $reply['seq'] = $seq;
 
-                       if ($omode != "T")
-                               $reply['counters'] = getAllCounters($this->link, $omode);
-                       else
-                               $reply['counters'] = getGlobalCounters($this->link);
-                }
+               if ($last_article_id != getLastArticleId()) {
+                       $reply['counters'] = getAllCounters();
+               }
 
-                $reply['runtime-info'] = make_runtime_info($this->link);
+               $reply['runtime-info'] = make_runtime_info();
 
-                print json_encode($reply);
+               print json_encode($reply);
        }
 
        /* 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( $_REQUEST["ids"]));
                $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-               catchupArticlesById($this->link, $ids, $cmode);
+               catchupArticlesById( $ids, $cmode);
 
-               print json_encode(array("message" => "UPDATE_COUNTERS"));
+               print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
        }
 
        function markSelected() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
                $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-               markArticlesById($this->link, $ids, $cmode);
+               $this->markArticlesById( $ids, $cmode);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function publishSelected() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
                $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-               publishArticlesById($this->link, $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";
 
                $reply = array();
 
-               $reply['error'] = sanity_check($this->link);
+               $reply['error'] = sanity_check();
 
                if ($reply['error']['code'] == 0) {
-                       $reply['init-params'] = make_init_params($this->link);
-                       $reply['runtime-info'] = make_runtime_info($this->link);
+                       $reply['init-params'] = make_init_params();
+                       $reply['runtime-info'] = make_runtime_info();
                }
 
                print json_encode($reply);
        }
 
-       function setArticleTags() {
-
-               $id = db_escape_string($_REQUEST["id"]);
-
-               $tags_str = db_escape_string($_REQUEST["tags_str"]);
-               $tags = array_unique(trim_array(explode(",", $tags_str)));
-
-               db_query($this->link, "BEGIN");
-
-               $result = db_query($this->link, "SELECT int_id FROM ttrss_user_entries WHERE
-                               ref_id = '$id' AND owner_uid = '".$_SESSION["uid"]."' LIMIT 1");
-
-               if (db_num_rows($result) == 1) {
-
-                       $tags_to_cache = array();
-
-                       $int_id = db_fetch_result($result, 0, "int_id");
-
-                       db_query($this->link, "DELETE FROM ttrss_tags WHERE
-                               post_int_id = $int_id AND owner_uid = '".$_SESSION["uid"]."'");
-
-                       foreach ($tags as $tag) {
-                               $tag = sanitize_tag($tag);
-
-                               if (!tag_is_valid($tag)) {
-                                       continue;
-                               }
-
-                               if (preg_match("/^[0-9]*$/", $tag)) {
-                                       continue;
-                               }
-
-                               //                                      print "<!-- $id : $int_id : $tag -->";
-
-                               if ($tag != '') {
-                                       db_query($this->link, "INSERT INTO ttrss_tags
-                                                               (post_int_id, owner_uid, tag_name) VALUES ('$int_id', '".$_SESSION["uid"]."', '$tag')");
-                               }
-
-                               array_push($tags_to_cache, $tag);
-                       }
-
-                       /* update tag cache */
-
-                       sort($tags_to_cache);
-                       $tags_str = join(",", $tags_to_cache);
-
-                       db_query($this->link, "UPDATE ttrss_user_entries
-                               SET tag_cache = '$tags_str' WHERE ref_id = '$id'
-                                               AND owner_uid = " . $_SESSION["uid"]);
-               }
-
-               db_query($this->link, "COMMIT");
-
-               $tags = get_article_tags($this->link, $id);
-               $tags_str = format_tags_string($tags, $id);
-               $tags_str_full = join(", ", $tags);
-
-               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)));
-       }
-
-       function regenOPMLKey() {
-               update_feed_access_key($this->link, 'OPML:Publish',
-               false, $_SESSION["uid"]);
-
-               $new_link = opml_publish_url($this->link);
-
-               print json_encode(array("link" => $new_link));
-       }
-
        function completeLabels() {
-               $search = db_escape_string($_REQUEST["search"]);
+               $search = db_escape_string( $_REQUEST["search"]);
 
-               $result = db_query($this->link, "SELECT DISTINCT caption FROM
+               $result = db_query( "SELECT DISTINCT caption FROM
                                ttrss_labels2
                                WHERE owner_uid = '".$_SESSION["uid"]."' AND
                                LOWER(caption) LIKE LOWER('$search%') ORDER BY caption
@@ -442,106 +364,30 @@ class RPC extends Handler_Protected {
                print "</ul>";
        }
 
-
-       function completeTags() {
-               $search = db_escape_string($_REQUEST["search"]);
-
-               $result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags
-                               WHERE owner_uid = '".$_SESSION["uid"]."' AND
-                               tag_name LIKE '$search%' ORDER BY tag_name
-                               LIMIT 10");
-
-               print "<ul>";
-               while ($line = db_fetch_assoc($result)) {
-                       print "<li>" . $line["tag_name"] . "</li>";
-               }
-               print "</ul>";
-       }
-
        function purge() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
+               $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
                $days = sprintf("%d", $_REQUEST["days"]);
 
                foreach ($ids as $id) {
 
-                       $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+                       $result = db_query( "SELECT id FROM ttrss_feeds WHERE
                                id = '$id' AND owner_uid = ".$_SESSION["uid"]);
 
                        if (db_num_rows($result) == 1) {
-                               purge_feed($this->link, $id, $days);
+                               purge_feed( $id, $days);
                        }
                }
        }
 
-       function getArticles() {
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
-               $articles = array();
-
-               foreach ($ids as $id) {
-                       if ($id) {
-                               array_push($articles, format_article($this->link, $id, 0, false));
-                       }
-               }
-
-               print json_encode($articles);
-       }
-
-       function checkDate() {
-               $date = db_escape_string($_REQUEST["date"]);
-               $date_parsed = strtotime($date);
-
-               print json_encode(array("result" => (bool)$date_parsed,
-                       "date" => date("c", $date_parsed)));
-       }
-
-       function assigntolabel() {
-               return $this->labelops(true);
-       }
-
-       function removefromlabel() {
-               return $this->labelops(false);
-       }
-
-       function labelops($assign) {
-               $reply = array();
-
-               $ids = explode(",", db_escape_string($_REQUEST["ids"]));
-               $label_id = db_escape_string($_REQUEST["lid"]);
-
-               $label = db_escape_string(label_find_caption($this->link, $label_id,
-               $_SESSION["uid"]));
-
-               $reply["info-for-headlines"] = array();
-
-               if ($label) {
-
-                       foreach ($ids as $id) {
-
-                               if ($assign)
-                                       label_add_article($this->link, $id, $label, $_SESSION["uid"]);
-                               else
-                                       label_remove_article($this->link, $id, $label, $_SESSION["uid"]);
-
-                               $labels = get_article_labels($this->link, $id, $_SESSION["uid"]);
-
-                               array_push($reply["info-for-headlines"],
-                               array("id" => $id, "labels" => format_article_labels($labels, $id)));
-
-                       }
-               }
-
-               $reply["message"] = "UPDATE_COUNTERS";
-
-               print json_encode($reply);
-       }
-
        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( $_REQUEST["search"]);
+               $limit = db_escape_string( $_REQUEST["limit"]);
+               $mode = (int) db_escape_string( $_REQUEST["mode"]);
+
+               require_once "feedbrowser.php";
 
                print json_encode(array("content" =>
-                       make_feed_browser($this->link, $search, $limit, $mode),
+                       make_feed_browser( $search, $limit, $mode),
                                "mode" => $mode));
        }
 
@@ -556,14 +402,14 @@ 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( $feed[0]);
+                               $feed_url = db_escape_string( $feed[1]);
 
-                               $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+                               $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($this->link, "INSERT INTO ttrss_feeds
+                                       $result = db_query( "INSERT INTO ttrss_feeds
                                                                        (owner_uid,feed_url,title,cat_id,site_url)
                                                                        VALUES ('".$_SESSION["uid"]."',
                                                                        '$feed_url', '$title', NULL, '')");
@@ -572,19 +418,19 @@ class RPC extends Handler_Protected {
                } else if ($mode == 2) {
                        // feed archive
                        foreach ($payload as $id) {
-                               $result = db_query($this->link, "SELECT * FROM ttrss_archived_feeds
+                               $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"));
+                                       $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($this->link, "SELECT id FROM ttrss_feeds WHERE
+                                       $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($this->link, "INSERT INTO ttrss_feeds
+                                               $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')");
@@ -594,76 +440,22 @@ class RPC extends Handler_Protected {
                }
        }
 
-       function digestgetcontents() {
-               $article_id = db_escape_string($_REQUEST['article_id']);
-
-               $result = db_query($this->link, "SELECT content,title,link,marked,published
-                       FROM ttrss_entries, ttrss_user_entries
-                       WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']);
-
-               $content = sanitize($this->link, db_fetch_result($result, 0, "content"));
-               $title = strip_tags(db_fetch_result($result, 0, "title"));
-               $article_url = htmlspecialchars(db_fetch_result($result, 0, "link"));
-               $marked = sql_bool_to_bool(db_fetch_result($result, 0, "marked"));
-               $published = sql_bool_to_bool(db_fetch_result($result, 0, "published"));
-
-               print json_encode(array("article" =>
-                       array("id" => $article_id, "url" => $article_url,
-                               "tags" => get_article_tags($this->link, $article_id),
-                               "marked" => $marked, "published" => $published,
-                               "title" => $title, "content" => $content)));
-       }
-
-       function digestupdate() {
-               $feed_id = db_escape_string($_REQUEST['feed_id']);
-               $offset = db_escape_string($_REQUEST['offset']);
-               $seq = db_escape_string($_REQUEST['seq']);
-
-               if (!$feed_id) $feed_id = -4;
-               if (!$offset) $offset = 0;
-
-               $reply = array();
-
-               $reply['seq'] = $seq;
-
-               $headlines = api_get_headlines($this->link, $feed_id, 30, $offset,
-                               '', ($feed_id == -4), true, false, "unread", "updated DESC", 0, 0);
-
-               $reply['headlines'] = array();
-               $reply['headlines']['title'] = getFeedTitle($this->link, $feed_id);
-               $reply['headlines']['content'] = $headlines;
-
-               print json_encode($reply);
-       }
-
-       function digestinit() {
-               $tmp_feeds = api_get_feeds($this->link, -4, true, false, 0);
-
-               $feeds = array();
-
-               foreach ($tmp_feeds as $f) {
-                       if ($f['id'] > 0 || $f['id'] == -4) array_push($feeds, $f);
-               }
-
-               print json_encode(array("feeds" => $feeds));
-       }
-
        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( $_REQUEST['feed_id']);
+               $is_cat = db_escape_string( $_REQUEST['is_cat']) == "true";
+               $mode = db_escape_string( $_REQUEST['mode']);
 
-               catchup_feed($this->link, $feed_id, $is_cat, false, $max_id);
+               catchup_feed( $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( $_REQUEST["cat"]);
 
-               add_feed_category($this->link, $cat);
+               add_feed_category( $cat);
 
-               $result = db_query($this->link, "SELECT id FROM ttrss_feed_categories WHERE
+               $result = db_query( "SELECT id FROM ttrss_feed_categories WHERE
                        title = '$cat' AND owner_uid = " . $_SESSION["uid"]);
 
                if (db_num_rows($result) == 1) {
@@ -672,106 +464,175 @@ class RPC extends Handler_Protected {
                        $id = 0;
                }
 
-               print_feed_cat_select($this->link, "cat_id", $id);
-       }
-
-       function regenFeedKey() {
-               $feed_id = db_escape_string($_REQUEST['id']);
-               $is_cat = db_escape_string($_REQUEST['is_cat']) == "true";
-
-               $new_key = update_feed_access_key($this->link, $feed_id, $is_cat);
-
-               print json_encode(array("link" => $new_key));
-       }
-
-       // Silent
-       function clearKeys() {
-               db_query($this->link, "DELETE FROM ttrss_access_keys WHERE
-                       owner_uid = " . $_SESSION["uid"]);
+               print_feed_cat_select( "cat_id", $id);
        }
 
        // Silent
        function clearArticleKeys() {
-               db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '' WHERE
+               db_query( "UPDATE ttrss_user_entries SET uuid = '' WHERE
                        owner_uid = " . $_SESSION["uid"]);
 
                return;
        }
 
-       function verifyRegexp() {
-               $reg_exp = $_REQUEST["reg_exp"];
+       function setpanelmode() {
+               $wide = (int) $_REQUEST["wide"];
 
-               $status = @preg_match("/$reg_exp/i", "TEST") !== false;
+               setcookie("ttrss_widescreen", $wide,
+                       time() + SESSION_COOKIE_LIFETIME);
 
-               print json_encode(array("status" => $status));
+               print json_encode(array("wide" => $wide));
        }
 
-       function buttonPlugin() {
-               $pclass = "button_" . basename($_REQUEST['plugin']);
-               $method = $_REQUEST['plugin_method'];
+       function updaterandomfeed() {
+               // Test if the feed need a update (update interval exceded).
+               if (DB_TYPE == "pgsql") {
+                       $update_limit_qpart = "AND ((
+                                       ttrss_feeds.update_interval = 0
+                                       AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
+                               ) OR (
+                                       ttrss_feeds.update_interval > 0
+                                       AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
+                               ) OR ttrss_feeds.last_updated IS NULL
+                               OR last_updated = '1970-01-01 00:00:00')";
+               } else {
+                       $update_limit_qpart = "AND ((
+                                       ttrss_feeds.update_interval = 0
+                                       AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
+                               ) OR (
+                                       ttrss_feeds.update_interval > 0
+                                       AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
+                               ) OR ttrss_feeds.last_updated IS NULL
+                               OR last_updated = '1970-01-01 00:00:00')";
+               }
+
+               // Test if feed is currently being updated by another process.
+               if (DB_TYPE == "pgsql") {
+                       $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '5 minutes')";
+               } else {
+                       $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))";
+               }
+
+               $random_qpart = sql_random_function();
 
-               if (class_exists($pclass)) {
-                       $plugin = new $pclass($this->link);
-                       if (method_exists($plugin, $method)) {
-                               return $plugin->$method();
+               // We search for feed needing update.
+               $result = db_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
+                       ORDER BY $random_qpart LIMIT 30");
+
+               $feed_id = -1;
+
+               require_once "rssfuncs.php";
+
+               $num_updated = 0;
+
+               $tstart = time();
+
+               while ($line = db_fetch_assoc($result)) {
+                       $feed_id = $line["id"];
+
+                       if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
+                               update_rss_feed( $feed_id, true);
+                               ++$num_updated;
+                       } else {
+                               break;
                        }
                }
-       }
 
-       function genHash() {
-               $hash = sha1(uniqid(rand(), true));
+               // Purge orphans and cleanup tags
+               purge_orphans();
+               cleanup_tags( 14, 50000);
+
+               if ($num_updated > 0) {
+                       print json_encode(array("message" => "UPDATE_COUNTERS",
+                               "num_updated" => $num_updated));
+               } else {
+                       print json_encode(array("message" => "NOTHING_TO_UPDATE"));
+               }
 
-               print json_encode(array("hash" => $hash));
        }
 
-       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']) != "";
+       private function markArticlesById( $ids, $cmode) {
 
-               foreach ($feeds as $feed) {
-                       $feed = trim($feed);
+               $tmp_ids = array();
 
-                       if (validate_feed_url($feed)) {
+               foreach ($ids as $id) {
+                       array_push($tmp_ids, "ref_id = '$id'");
+               }
 
-                               db_query($this->link, "BEGIN");
+               $ids_qpart = join(" OR ", $tmp_ids);
 
-                               $update_method = 0;
+               if ($cmode == 0) {
+                       db_query( "UPDATE ttrss_user_entries SET
+                       marked = false, last_marked = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["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"]);
+               } else {
+                       db_query( "UPDATE ttrss_user_entries SET
+                       marked = NOT marked,last_marked = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+               }
+       }
 
-                               if ($cat_id == "0" || !$cat_id) {
-                                       $cat_qpart = "NULL";
-                               } else {
-                                       $cat_qpart = "'$cat_id'";
-                               }
+       private function publishArticlesById( $ids, $cmode) {
 
-                               $result = db_query($this->link,
-                                       "SELECT id FROM ttrss_feeds
-                                       WHERE feed_url = '$feed' AND owner_uid = ".$_SESSION["uid"]);
+               $tmp_ids = array();
 
-                               if (db_num_rows($result) == 0) {
-                                       $result = db_query($this->link,
-                                               "INSERT INTO ttrss_feeds
-                                                       (owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method)
-                                               VALUES ('".$_SESSION["uid"]."', '$feed',
-                                                       '[Unknown]', $cat_qpart, '$login', '$pass', '$update_method')");
-                               }
+               foreach ($ids as $id) {
+                       array_push($tmp_ids, "ref_id = '$id'");
+               }
 
-                               db_query($this->link, "COMMIT");
-                       }
+               $ids_qpart = join(" OR ", $tmp_ids);
+
+               if ($cmode == 0) {
+                       db_query( "UPDATE ttrss_user_entries SET
+                       published = false,last_published = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["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"]);
+               } else {
+                       db_query( "UPDATE ttrss_user_entries SET
+                       published = NOT published,last_published = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["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);
                }
        }
 
-       function setScore() {
-               $id = db_escape_string($_REQUEST['id']);
-               $score = (int)db_escape_string($_REQUEST['score']);
+       function getlinktitlebyid() {
+               $id = db_escape_string( $_REQUEST['id']);
 
-               db_query($this->link, "UPDATE ttrss_user_entries SET
-                       score = '$score' WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+               $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"]);
 
-               print json_encode(array("id" => $id,
-                       "score_pic" => theme_image($link, get_score_pic($score))));
+               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"));
+               }
        }
 
 }