public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 17:15:55 +00:00
Code Issues Releases Wiki Activity

wrap rssfuncs into rssutils class

Browse Source
This commit is contained in:
Andrew Dolgov
2017-05-05 18:10:07 +03:00
parent 65af3b2cbb
commit e6c886bf66
9 changed files with 117 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/pref/feeds.php
View File

@@ -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();

4
classes/pref/filters.php
View File

@@ -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) {