valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hook_feed_basic_info' of wn/tt-rss into master

This commit is contained in:
fox 2017-10-01 09:52:51 +00:00 committed by Gogs
parent af13f3009c 3476690cbf
commit 0f0d6ca559
2 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/pluginhost.php
View File

@ -54,6 +54,7 @@ class PluginHost {
const HOOK_ENCLOSURE_ENTRY = 33; const HOOK_ENCLOSURE_ENTRY = 33;
const HOOK_FORMAT_ARTICLE = 34; const HOOK_FORMAT_ARTICLE = 34;
const HOOK_FORMAT_ARTICLE_CDM = 35; const HOOK_FORMAT_ARTICLE_CDM = 35;
const HOOK_FEED_BASIC_INFO = 36;
const KIND_ALL = 1; const KIND_ALL = 1;
const KIND_SYSTEM = 2; const KIND_SYSTEM = 2;
@ -436,4 +437,4 @@ class PluginHost {
function get_filter_actions() { function get_filter_actions() {
return $this->plugin_actions; return $this->plugin_actions;
} }
} }

63
classes/rssutils.php
View File

@ -205,9 +205,11 @@ class RSSUtils {
$feed = db_escape_string($feed); $feed = db_escape_string($feed);
$result = db_query("SELECT feed_url,auth_pass,auth_login,auth_pass_encrypted $result = db_query("SELECT owner_uid,feed_url,auth_pass,auth_login,auth_pass_encrypted
FROM ttrss_feeds WHERE id = '$feed'"); FROM ttrss_feeds WHERE id = '$feed'");
$owner_uid = db_fetch_result($result, 0, "owner_uid");
$auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result, $auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result,
0, "auth_pass_encrypted")); 0, "auth_pass_encrypted"));
@ -221,42 +223,59 @@ class RSSUtils {
$fetch_url = db_fetch_result($result, 0, "feed_url"); $fetch_url = db_fetch_result($result, 0, "feed_url");
$feed_data = fetch_file_contents($fetch_url, false, $pluginhost = new PluginHost();
$auth_login, $auth_pass, false, $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
FEED_FETCH_TIMEOUT,
0);
global $fetch_curl_used; $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
$pluginhost->load_data();
if (!$fetch_curl_used) { $basic_info = array();
$tmp = @gzdecode($feed_data); foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_BASIC_INFO) as $plugin) {
$basic_info = $plugin->hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass);
if ($tmp) $feed_data = $tmp;
} }
$feed_data = trim($feed_data); if (!$basic_info) {
$feed_data = fetch_file_contents($fetch_url, false,
$auth_login, $auth_pass, false,
FEED_FETCH_TIMEOUT,
0);
$rss = new FeedParser($feed_data); global $fetch_curl_used;
$rss->init();
if (!$rss->error()) { if (!$fetch_curl_used) {
$tmp = @gzdecode($feed_data);
if ($tmp) $feed_data = $tmp;
}
$feed_data = trim($feed_data);
$rss = new FeedParser($feed_data);
$rss->init();
if (!$rss->error()) {
$basic_info = array(
'title' => db_escape_string(mb_substr($rss->get_title(), 0, 199)),
'site_url' => db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245))
);
}
}
if ($basic_info && is_array($basic_info)) {
$result = db_query("SELECT title, site_url FROM ttrss_feeds WHERE id = '$feed'"); $result = db_query("SELECT title, site_url FROM ttrss_feeds WHERE id = '$feed'");
$registered_title = db_fetch_result($result, 0, "title"); $registered_title = db_fetch_result($result, 0, "title");
$orig_site_url = db_fetch_result($result, 0, "site_url"); $orig_site_url = db_fetch_result($result, 0, "site_url");
$site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245)); if ($basic_info['title'] && (!$registered_title || $registered_title == "[Unknown]")) {
$feed_title = db_escape_string(mb_substr($rss->get_title(), 0, 199));
if ($feed_title && (!$registered_title || $registered_title == "[Unknown]")) {
db_query("UPDATE ttrss_feeds SET db_query("UPDATE ttrss_feeds SET
title = '$feed_title' WHERE id = '$feed'"); title = '${basic_info['title']}' WHERE id = '$feed'");
} }
if ($site_url && $orig_site_url != $site_url) { if ($basic_info['site_url'] && $orig_site_url != $basic_info['site_url']) {
db_query("UPDATE ttrss_feeds SET db_query("UPDATE ttrss_feeds SET
site_url = '$site_url' WHERE id = '$feed'"); site_url = '${basic_info['site_url']}' WHERE id = '$feed'");
} }
} }
} }
@ -1520,4 +1539,4 @@ class RSSUtils {
} }