]> git.wh0rd.org - tt-rss.git/blobdiff - classes/rpc.php
rpc: move setArticleTags to article
[tt-rss.git] / classes / rpc.php
index ea139935ee24faa331481e6d9bf0f9ac1ed51f6f..a78e079caf6934a057c3607c440e185f6bebb396 100644 (file)
@@ -152,15 +152,64 @@ class RPC extends Handler_Protected {
                $result = db_query($this->link, "DELETE FROM ttrss_user_entries
                WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
+               purge_orphans($this->link);
+
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
        function unarchive() {
-               $ids = db_escape_string($this->link, $_REQUEST["ids"]);
+               $ids = explode(",", $_REQUEST["ids"]);
+
+               foreach ($ids as $id) {
+                       $id = db_escape_string($this->link, trim($id));
+                       db_query($this->link, "BEGIN");
+
+                       $result = db_query($this->link, "SELECT feed_url,site_url,title FROM ttrss_archived_feeds
+                               WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = $id
+                               AND owner_uid = ".$_SESSION["uid"].")");
+
+                       if (db_num_rows($result) != 0) {
+                               $feed_url = db_escape_string($this->link, db_fetch_result($result, 0, "feed_url"));
+                               $site_url = db_escape_string($this->link, db_fetch_result($result, 0, "site_url"));
+                               $title = db_escape_string($this->link, db_fetch_result($result, 0, "title"));
+
+                               $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
+                                       AND owner_uid = " .$_SESSION["uid"]);
+
+                               if (db_num_rows($result) == 0) {
+
+                                       if (!$title) $title = '[Unknown]';
+
+                                       $result = db_query($this->link,
+                                               "INSERT INTO ttrss_feeds
+                                                       (owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
+                                                       VALUES (".$_SESSION["uid"].",
+                                                       '$feed_url',
+                                                       '$site_url',
+                                                       '$title',
+                                                       NULL, '', '', 0)");
+
+                                       $result = db_query($this->link,
+                                               "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
+                                               AND owner_uid = ".$_SESSION["uid"]);
+
+                                       if (db_num_rows($result) != 0) {
+                                               $feed_id = db_fetch_result($result, 0, "id");
+                                       }
+
+                               } else {
+                                       $feed_id = db_fetch_result($result, 0, "id");
+                               }
 
-               $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"]);
+                               if ($feed_id) {
+                                       $result = db_query($this->link, "UPDATE ttrss_user_entries
+                                               SET feed_id = '$feed_id', orig_feed_id = NULL
+                                               WHERE ref_id = $id AND owner_uid = " . $_SESSION["uid"]);
+                               }
+                       }
+
+                       db_query($this->link, "COMMIT");
+               }
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
@@ -298,79 +347,6 @@ class RPC extends Handler_Protected {
                print json_encode($reply);
        }
 
-       function setArticleTags() {
-
-               $id = db_escape_string($this->link, $_REQUEST["id"]);
-
-               $tags_str = db_escape_string($this->link, $_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() {
-               $this->update_feed_access_key($this->link, 'OPML:Publish',
-               false, $_SESSION["uid"]);
-
-               $new_link = Opml::opml_publish_url($this->link);
-
-               print json_encode(array("link" => $new_link));
-       }
-
        function completeLabels() {
                $search = db_escape_string($this->link, $_REQUEST["search"]);
 
@@ -431,14 +407,6 @@ class RPC extends Handler_Protected {
                print json_encode($articles);
        }
 
-       function checkDate() {
-               $date = db_escape_string($this->link, $_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);
        }
@@ -544,9 +512,9 @@ class RPC extends Handler_Protected {
        function catchupFeed() {
                $feed_id = db_escape_string($this->link, $_REQUEST['feed_id']);
                $is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
-               $max_id = (int) db_escape_string($this->link, $_REQUEST['max_id']);
+               $mode = db_escape_string($this->link, $_REQUEST['mode']);
 
-               catchup_feed($this->link, $feed_id, $is_cat, false, $max_id);
+               catchup_feed($this->link, $feed_id, $is_cat, false, false, $mode);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
@@ -568,21 +536,6 @@ class RPC extends Handler_Protected {
                print_feed_cat_select($this->link, "cat_id", $id);
        }
 
-       function regenFeedKey() {
-               $feed_id = db_escape_string($this->link, $_REQUEST['id']);
-               $is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
-
-               $new_key = $this->update_feed_access_key($this->link, $feed_id, $is_cat);
-
-               print json_encode(array("link" => $new_key));
-       }
-
-       // Silent
-       function clearKeys() {
-               db_query($this->link, "DELETE FROM ttrss_access_keys WHERE
-                       owner_uid = " . $_SESSION["uid"]);
-       }
-
        // Silent
        function clearArticleKeys() {
                db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '' WHERE
@@ -591,79 +544,6 @@ class RPC extends Handler_Protected {
                return;
        }
 
-       function verifyRegexp() {
-               $reg_exp = $_REQUEST["reg_exp"];
-
-               $status = @preg_match("/$reg_exp/i", "TEST") !== false;
-
-               print json_encode(array("status" => $status));
-       }
-
-       /* function buttonPlugin() {
-               $pclass = "button_" . basename($_REQUEST['plugin']);
-               $method = $_REQUEST['plugin_method'];
-
-               if (class_exists($pclass)) {
-                       $plugin = new $pclass($this->link);
-                       if (method_exists($plugin, $method)) {
-                               return $plugin->$method();
-                       }
-               }
-       } */
-
-       function genHash() {
-               $hash = sha1(uniqid(rand(), true));
-
-               print json_encode(array("hash" => $hash));
-       }
-
-       function batchAddFeeds() {
-               $cat_id = db_escape_string($this->link, $_REQUEST['cat']);
-               $feeds = explode("\n", db_escape_string($this->link, $_REQUEST['feeds']));
-               $login = db_escape_string($this->link, $_REQUEST['login']);
-               $pass = db_escape_string($this->link, $_REQUEST['pass']);
-
-               foreach ($feeds as $feed) {
-                       $feed = trim($feed);
-
-                       if (validate_feed_url($feed)) {
-
-                               db_query($this->link, "BEGIN");
-
-                               if ($cat_id == "0" || !$cat_id) {
-                                       $cat_qpart = "NULL";
-                               } else {
-                                       $cat_qpart = "'$cat_id'";
-                               }
-
-                               $result = db_query($this->link,
-                                       "SELECT id FROM ttrss_feeds
-                                       WHERE feed_url = '$feed' AND owner_uid = ".$_SESSION["uid"]);
-
-                               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', 0)");
-                               }
-
-                               db_query($this->link, "COMMIT");
-                       }
-               }
-       }
-
-       function setScore() {
-               $ids = db_escape_string($this->link, $_REQUEST['id']);
-               $score = (int)db_escape_string($this->link, $_REQUEST['score']);
-
-               db_query($this->link, "UPDATE ttrss_user_entries SET
-                       score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
-
-               print json_encode(array("id" => $id,
-                       "score_pic" => get_score_pic($score)));
-       }
-
        function setpanelmode() {
                $wide = (int) $_REQUEST["wide"];
 
@@ -735,6 +615,10 @@ class RPC extends Handler_Protected {
                        }
                }
 
+               // Purge orphans and cleanup tags
+               purge_orphans($this->link);
+               cleanup_tags($this->link, 14, 50000);
+
                if ($num_updated > 0) {
                        print json_encode(array("message" => "UPDATE_COUNTERS",
                                "num_updated" => $num_updated));
@@ -744,29 +628,6 @@ class RPC extends Handler_Protected {
 
        }
 
-       function update_feed_access_key($link, $feed_id, $is_cat, $owner_uid = false) {
-               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-
-               $sql_is_cat = bool_to_sql_bool($is_cat);
-
-               $result = db_query($link, "SELECT access_key FROM ttrss_access_keys
-                       WHERE feed_id = '$feed_id'      AND is_cat = $sql_is_cat
-                       AND owner_uid = " . $owner_uid);
-
-               if (db_num_rows($result) == 1) {
-                       $key = db_escape_string($this->link, sha1(uniqid(rand(), true)));
-
-                       db_query($link, "UPDATE ttrss_access_keys SET access_key = '$key'
-                               WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
-                               AND owner_uid = " . $owner_uid);
-
-                       return $key;
-
-               } else {
-                       return get_feed_access_key($link, $feed_id, $is_cat, $owner_uid);
-               }
-       }
-
        private function markArticlesById($link, $ids, $cmode) {
 
                $tmp_ids = array();