diff options
| author | Andrew Dolgov <[email protected]> | 2017-05-05 18:10:07 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-05-05 18:10:07 +0300 |
| commit | e6c886bf66928d4bd496672f12b79b547747677b (patch) | |
| tree | 7f7ab97379a201799c934ecb69da243045394cb4 /classes/pref | |
| parent | 65af3b2cbba06901612cf721359aea792037cc5a (diff) | |
wrap rssfuncs into rssutils class
Diffstat (limited to 'classes/pref')
| -rwxr-xr-x | classes/pref/feeds.php | 14 | ||||
| -rwxr-xr-x | classes/pref/filters.php | 4 |
2 files changed, 6 insertions, 12 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index f1eea93f7..78e0f2f2b 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1024,9 +1024,7 @@ class Pref_Feeds extends Handler_Protected { WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]); if ($reset_basic_info) { - require_once "rssfuncs.php"; - - set_basic_feed_info($feed_id); + RSSUtils::set_basic_feed_info($feed_id); } PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED, @@ -1147,8 +1145,6 @@ class Pref_Feeds extends Handler_Protected { } function rescore() { - require_once "rssfuncs.php"; - $ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"])); foreach ($ids as $id) { @@ -1170,11 +1166,11 @@ class Pref_Feeds extends Handler_Protected { $tags = Article::get_article_tags($line["ref_id"]); - $article_filters = get_article_filters($filters, $line['title'], + $article_filters = RSSUtils::get_article_filters($filters, $line['title'], $line['content'], $line['link'], strtotime($line['updated']), $line['author'], $tags); - $new_score = calculate_article_score($article_filters); + $new_score = RSSUtils::calculate_article_score($article_filters); if (!$scores[$new_score]) $scores[$new_score] = array(); @@ -1227,11 +1223,11 @@ class Pref_Feeds extends Handler_Protected { $tags = Article::get_article_tags($line["ref_id"]); - $article_filters = get_article_filters($filters, $line['title'], + $article_filters = RSSUtils::get_article_filters($filters, $line['title'], $line['content'], $line['link'], strtotime($line['updated']), $line['author'], $tags); - $new_score = calculate_article_score($article_filters); + $new_score = RSSUtils::calculate_article_score($article_filters); if (!$scores[$new_score]) $scores[$new_score] = array(); diff --git a/classes/pref/filters.php b/classes/pref/filters.php index e4943a5a5..e5abf4627 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -44,8 +44,6 @@ class Pref_Filters extends Handler_Protected { } function testFilterDo() { - require_once "include/rssfuncs.php"; - $offset = (int) db_escape_string($_REQUEST["offset"]); $limit = (int) db_escape_string($_REQUEST["limit"]); @@ -129,7 +127,7 @@ class Pref_Filters extends Handler_Protected { while ($line = db_fetch_assoc($result)) { - $rc = get_article_filters(array($filter), $line['title'], $line['content'], $line['link'], + $rc = RSSUtils::get_article_filters(array($filter), $line['title'], $line['content'], $line['link'], $line['author'], explode(",", $line['tag_cache'])); if (count($rc) > 0) { |