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

weird magpie Atom parse workaround, feed is always updated when added (to get title, etc.) even if DAEMON_REFRESH_ONLY is set

This commit is contained in:
Andrew Dolgov 2005-11-27 19:31:20 +01:00
parent bd34c52822
commit ddb68b812c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend.php
View File

@ -1219,7 +1219,7 @@
$feed_id = db_fetch_result($result, 0, "id"); $feed_id = db_fetch_result($result, 0, "id");
if ($feed_id) { if ($feed_id) {
update_rss_feed($link, $feed_link, $feed_id); update_rss_feed($link, $feed_link, $feed_id, true);
} }
} else { } else {

17
functions.php
View File

@ -160,11 +160,11 @@
} }
} }
function update_rss_feed($link, $feed_url, $feed) { function update_rss_feed($link, $feed_url, $feed, $ignore_daemon = false) {
if (WEB_DEMO_MODE) return; if (WEB_DEMO_MODE) return;
if (DAEMON_REFRESH_ONLY && !$_GET["daemon"]) { if (DAEMON_REFRESH_ONLY && !$_GET["daemon"] && !$ignore_daemon) {
return; return;
} }
@ -232,7 +232,12 @@
array_push($filters[$line["name"]], $line["reg_exp"]); array_push($filters[$line["name"]], $line["reg_exp"]);
} }
foreach ($rss->items as $item) { $iterator = $rss->items;
if (!$iterator) $iterator = $rss->entries;
if (!$iterator) $iterator = $rss;
foreach ($iterator as $item) {
$entry_guid = $item["id"]; $entry_guid = $item["id"];
@ -261,13 +266,17 @@
$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp); $entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
$entry_title = $item["title"]; $entry_title = $item["title"];
$entry_link = $item["link"];
// strange Magpie workaround
$entry_link = $item["link_"];
if (!$entry_link) $entry_link = $item["link"];
if (!$entry_title) continue; if (!$entry_title) continue;
if (!$entry_link) continue; if (!$entry_link) continue;
$entry_content = $item["content:escaped"]; $entry_content = $item["content:escaped"];
if (!$entry_content) $entry_content = $item["summary"];
if (!$entry_content) $entry_content = $item["content:encoded"]; if (!$entry_content) $entry_content = $item["content:encoded"];
if (!$entry_content) $entry_content = $item["content"]; if (!$entry_content) $entry_content = $item["content"];
if (!$entry_content) $entry_content = $item["description"]; if (!$entry_content) $entry_content = $item["description"];