remove long forgotten stuff related to feed debugging actionbar

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 68a3eaa38456808bcac4fcd64455dcdac0714973..19bec5441df69a84ecc6acbe30a3155ba4523214 100755 (executable)
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1111,117 +1111,6 @@ class Pref_Feeds extends Handler_Protected {
                return;
        }
 
-       function clear() {
-               $id = $_REQUEST["id"];
-               $this->clear_feed_articles($id);
-       }
-
-       function rescore() {
-               $ids = explode(",", $_REQUEST["ids"]);
-
-               foreach ($ids as $id) {
-
-                       $filters = load_filters($id, $_SESSION["uid"], 6);
-
-                       $result = db_query("SELECT
-                               title, content, link, ref_id, author,".
-                               SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
-                               FROM
-                                       ttrss_user_entries, ttrss_entries
-                                       WHERE ref_id = id AND feed_id = '$id' AND
-                                               owner_uid = " .$_SESSION['uid']."
-                                       ");
-
-                       $scores = array();
-
-                       while ($line = db_fetch_assoc($result)) {
-
-                               $tags = Article::get_article_tags($line["ref_id"]);
-
-                               $article_filters = RSSUtils::get_article_filters($filters, $line['title'],
-                                       $line['content'], $line['link'], strtotime($line['updated']),
-                                       $line['author'], $tags);
-
-                               $new_score = RSSUtils::calculate_article_score($article_filters);
-
-                               if (!$scores[$new_score]) $scores[$new_score] = array();
-
-                               array_push($scores[$new_score], $line['ref_id']);
-                       }
-
-                       foreach (array_keys($scores) as $s) {
-                               if ($s > 1000) {
-                                       db_query("UPDATE ttrss_user_entries SET score = '$s',
-                                               marked = true WHERE
-                                               ref_id IN (" . join(',', $scores[$s]) . ")");
-                               } else if ($s < -500) {
-                                       db_query("UPDATE ttrss_user_entries SET score = '$s',
-                                               unread = false WHERE
-                                               ref_id IN (" . join(',', $scores[$s]) . ")");
-                               } else {
-                                       db_query("UPDATE ttrss_user_entries SET score = '$s' WHERE
-                                               ref_id IN (" . join(',', $scores[$s]) . ")");
-                               }
-                       }
-               }
-
-               print __("All done.");
-
-       }
-
-       function rescoreAll() {
-
-               $result = db_query(
-                       "SELECT id FROM ttrss_feeds WHERE owner_uid = " . $_SESSION['uid']);
-
-               while ($feed_line = db_fetch_assoc($result)) {
-
-                       $id = $feed_line["id"];
-
-                       $filters = load_filters($id, $_SESSION["uid"], 6);
-
-                       $tmp_result = db_query("SELECT
-                               title, content, link, ref_id, author,".
-                                       SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
-                                       FROM
-                                       ttrss_user_entries, ttrss_entries
-                                       WHERE ref_id = id AND feed_id = '$id' AND
-                                               owner_uid = " .$_SESSION['uid']."
-                                       ");
-
-                       $scores = array();
-
-                       while ($line = db_fetch_assoc($tmp_result)) {
-
-                               $tags = Article::get_article_tags($line["ref_id"]);
-
-                               $article_filters = RSSUtils::get_article_filters($filters, $line['title'],
-                                       $line['content'], $line['link'], strtotime($line['updated']),
-                                       $line['author'], $tags);
-
-                               $new_score = RSSUtils::calculate_article_score($article_filters);
-
-                               if (!$scores[$new_score]) $scores[$new_score] = array();
-
-                               array_push($scores[$new_score], $line['ref_id']);
-                       }
-
-                       foreach (array_keys($scores) as $s) {
-                               if ($s > 1000) {
-                                       db_query("UPDATE ttrss_user_entries SET score = '$s',
-                                               marked = true WHERE
-                                               ref_id IN (" . join(',', $scores[$s]) . ")");
-                               } else {
-                                       db_query("UPDATE ttrss_user_entries SET score = '$s' WHERE
-                                               ref_id IN (" . join(',', $scores[$s]) . ")");
-                               }
-                       }
-               }
-
-               print __("All done.");
-
-       }
-
        function categorize() {
                $ids = explode(",", $_REQUEST["ids"]);
 
@@ -1688,29 +1577,6 @@ class Pref_Feeds extends Handler_Protected {
                print "</div>";
        }
 
-       /**
-        * Purge a feed contents, marked articles excepted.
-        *
-        * @param mixed $link The database connection.
-        * @param integer $id The id of the feed to purge.
-        * @return void
-        */
-       private function clear_feed_articles($id) {
-
-               if ($id != 0) {
-                       $result = db_query("DELETE FROM ttrss_user_entries
-                       WHERE feed_id = '$id' AND marked = false AND owner_uid = " . $_SESSION["uid"]);
-               } else {
-                       $result = db_query("DELETE FROM ttrss_user_entries
-                       WHERE feed_id IS NULL AND marked = false AND owner_uid = " . $_SESSION["uid"]);
-               }
-
-               $result = db_query("DELETE FROM ttrss_entries WHERE
-                       (SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
-
-               CCache::update($id, $_SESSION['uid']);
-       } // function clear_feed_articles
-
        private function remove_feed_category($id, $owner_uid) {
 
                db_query("DELETE FROM ttrss_feed_categories

diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 4cd52487aac98564b041cd0239c7e9aaf79f3519..a9d1557bc9083c9850bcb9979f67c35508c5a383 100755 (executable)
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -822,11 +822,6 @@ class Pref_Filters extends Handler_Protected {
                print "<button dojoType=\"dijit.form.Button\" onclick=\"return removeSelectedFilters()\">".
                        __('Remove')."</button> ";
 
-               if (defined('_ENABLE_FEED_DEBUGGING')) {
-                       print "<button dojoType=\"dijit.form.Button\" onclick=\"rescore_all_feeds()\">".
-                               __('Rescore articles')."</button> ";
-               }
-
                print "</div>"; # toolbar
                print "</div>"; # toolbar-frame
                print "<div id=\"pref-filter-content\" dojoType=\"dijit.layout.ContentPane\" region=\"center\">";

diff --git a/classes/rpc.php b/classes/rpc.php
index 6ec14dd42ea19e3ac6f5ad540d178addc46bcfdb..dd592b4d46010633076fa3fdfd78b8228523dc24 100755 (executable)
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -348,22 +348,6 @@ class RPC extends Handler_Protected {
                print "</ul>";
        }
 
-       function purge() {
-               $ids = explode(",", $_REQUEST["ids"]);
-               $days = (int) $_REQUEST["days"];
-
-               $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
-                               id = ? AND owner_uid = ?");
-
-               foreach ($ids as $id) {
-                       $sth->execute([$id, $_SESSION['uid']]);
-
-                       if ($sth->fetch()) {
-                               purge_feed($id, $days);
-                       }
-               }
-       }
-
        function updateFeedBrowser() {
                if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
 

diff --git a/js/prefs.js b/js/prefs.js
index 34ccbac905e927ae651a179cd2ffe8cff5b5a15b..0512e0e34e76d69adbfde254c426c70447d46db2 100755 (executable)
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -401,65 +401,6 @@ function removeSelectedFeeds() {
        return false;
 }
 
-function clearSelectedFeeds() {
-
-       var sel_rows = getSelectedFeeds();
-
-       if (sel_rows.length > 1) {
-               alert(__("Please select only one feed."));
-               return;
-       }
-
-       if (sel_rows.length > 0) {
-
-               var ok = confirm(__("Erase all non-starred articles in selected feed?"));
-
-               if (ok) {
-                       notify_progress("Clearing selected feed...");
-                       clearFeedArticles(sel_rows[0]);
-               }
-
-       } else {
-
-               alert(__("No feeds are selected."));
-
-       }
-
-       return false;
-}
-
-function purgeSelectedFeeds() {
-
-       var sel_rows = getSelectedFeeds();
-
-       if (sel_rows.length > 0) {
-
-               var pr = prompt(__("How many days of articles to keep (0 - use default)?"), "0");
-
-               if (pr != undefined) {
-                       notify_progress("Purging selected feed...");
-
-                       var query = "?op=rpc&method=purge&ids="+
-                               param_escape(sel_rows.toString()) + "&days=" + pr;
-
-                       console.log(query);
-
-                       new Ajax.Request("prefs.php",   {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       notify('');
-                               } });
-               }
-
-       } else {
-
-               alert(__("No feeds are selected."));
-
-       }
-
-       return false;
-}
-
 function editSelectedUser() {
        var rows = getSelectedUsers();
 
@@ -1177,107 +1118,6 @@ function opmlRegenKey() {
        return false;
 }
 
-function feedActionChange() {
-       var chooser = $("feedActionChooser");
-       var opid = chooser[chooser.selectedIndex].value;
-
-       chooser.selectedIndex = 0;
-       feedActionGo(opid);
-}
-
-function feedActionGo(op) {
-       if (op == "facEdit") {
-
-               var rows = getSelectedFeeds();
-
-               if (rows.length > 1) {
-                       editSelectedFeeds();
-               } else {
-                       editSelectedFeed();
-               }
-       }
-
-       if (op == "facClear") {
-               clearSelectedFeeds();
-       }
-
-       if (op == "facPurge") {
-               purgeSelectedFeeds();
-       }
-
-       if (op == "facEditCats") {
-               editFeedCats();
-       }
-
-       if (op == "facRescore") {
-               rescoreSelectedFeeds();
-       }
-
-       if (op == "facUnsubscribe") {
-               removeSelectedFeeds();
-       }
-}
-
-function clearFeedArticles(feed_id) {
-
-       notify_progress("Clearing feed...");
-
-       var query = "?op=pref-feeds&quiet=1&method=clear&id=" + feed_id;
-
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function(transport) {
-                               notify('');
-                       } });
-
-       return false;
-}
-
-function rescoreSelectedFeeds() {
-
-       var sel_rows = getSelectedFeeds();
-
-       if (sel_rows.length > 0) {
-
-               //var ok = confirm(__("Rescore last 100 articles in selected feeds?"));
-               var ok = confirm(__("Rescore articles in selected feeds?"));
-
-               if (ok) {
-                       notify_progress("Rescoring selected feeds...", true);
-
-                       var query = "?op=pref-feeds&method=rescore&quiet=1&ids="+
-                               param_escape(sel_rows.toString());
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                               notify_callback2(transport);
-                       } });
-
-               }
-       } else {
-               alert(__("No feeds are selected."));
-       }
-
-       return false;
-}
-
-function rescore_all_feeds() {
-       var ok = confirm(__("Rescore all articles? This operation may take a lot of time."));
-
-       if (ok) {
-               notify_progress("Rescoring feeds...", true);
-
-               var query = "?op=pref-feeds&method=rescoreAll&quiet=1";
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       notify_callback2(transport);
-               } });
-       }
-}
-
 function labelColorReset() {
        var labels = getSelectedLabels();