public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-27 14:11:29 +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

7
classes/api.php
View File

@@ -412,12 +412,10 @@ class API extends Handler {
}
function updateFeed() {
require_once "include/rssfuncs.php";
$feed_id = (int) $this->dbh->escape_string($_REQUEST["feed_id"]);
if (!ini_get("open_basedir")) {
update_rss_feed($feed_id);
RSSUtils::update_rss_feed($feed_id);
}
$this->wrap(self::STATUS_OK, array("status" => "OK"));
@@ -678,8 +676,7 @@ class API extends Handler {
$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
if (!$cache_images && time() - $last_updated > 120) {
include "rssfuncs.php";
update_rss_feed($feed_id, true);
RSSUtils::update_rss_feed($feed_id, true);
} else {
db_query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
WHERE id = '$feed_id'");

10
classes/feeds.php
View File

@@ -202,8 +202,7 @@ class Feeds extends Handler_Protected {
$cache_images = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "cache_images"));
if (!$cache_images && time() - $last_updated > 120) {
include "rssfuncs.php";
update_rss_feed($feed, true);
RSSUtils::update_rss_feed($feed, true);
} else {
$this->dbh->query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
WHERE id = '$feed'");
@@ -1222,8 +1221,7 @@ class Feeds extends Handler_Protected {
<pre><?php
if ($do_update) {
include "rssfuncs.php";
update_rss_feed($feed_id, true);
RSSUtils::update_rss_feed($feed_id, true);
}
?></pre>
@@ -1491,8 +1489,6 @@ class Feeds extends Handler_Protected {
global $fetch_last_error;
global $fetch_last_error_content;
require_once "include/rssfuncs.php";
$url = fix_url($url);
if (!$url || !validate_feed_url($url)) return array("code" => 2);
@@ -1550,7 +1546,7 @@ class Feeds extends Handler_Protected {
$feed_id = db_fetch_result($result, 0, "id");
if ($feed_id) {
set_basic_feed_info($feed_id);
RSSUtils::set_basic_feed_info($feed_id);
}
return array("code" => 1, "feed_id" => (int) $feed_id);

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

4
classes/rpc.php
View File

@@ -538,8 +538,6 @@ class RPC extends Handler_Protected {
$feed_id = -1;
require_once "rssfuncs.php";
$num_updated = 0;
$tstart = time();
@@ -548,7 +546,7 @@ class RPC extends Handler_Protected {
$feed_id = $line["id"];
if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
update_rss_feed($feed_id, true);
RSSUtils::update_rss_feed($feed_id, true);
++$num_updated;
} else {
break;

1577
classes/rssutils.php Normal file
View File

File diff suppressed because it is too large Load Diff