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

misc fixes in site_url/icon_url parsing

This commit is contained in:
Andrew Dolgov 2012-01-17 10:22:47 +04:00
parent 73c32678ae
commit 0cf816377f
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/rssfuncs.php
View File

@ -417,12 +417,18 @@
$owner_uid = db_fetch_result($result, 0, "owner_uid"); $owner_uid = db_fetch_result($result, 0, "owner_uid");
if ($use_simplepie) { if ($use_simplepie) {
$site_url = $rss->get_link(); $site_url = db_escape_string(trim($rss->get_link()));
} else { } else {
$site_url = $rss->channel["link"]; $site_url = db_escape_string(trim($rss->channel["link"]));
}
// weird, weird Magpie
if (!$use_simplepie) {
if (!$site_url) $site_url = db_escape_string($rss->channel["link_"]);
} }
$site_url = rewrite_relative_url($fetch_url, $site_url); $site_url = rewrite_relative_url($fetch_url, $site_url);
$site_url = substr($site_url, 0, 250);
if ($debug_enabled) { if ($debug_enabled) {
_debug("update_rss_feed: checking favicon..."); _debug("update_rss_feed: checking favicon...");
@ -446,12 +452,7 @@
title = '$feed_title' WHERE id = '$feed'"); title = '$feed_title' WHERE id = '$feed'");
} }
// weird, weird Magpie if ($site_url && $orig_site_url != $site_url) {
if (!$use_simplepie) {
if (!$site_url) $site_url = db_escape_string($rss->channel["link_"]);
}
if ($site_url && $orig_site_url != db_escape_string($site_url)) {
db_query($link, "UPDATE ttrss_feeds SET db_query($link, "UPDATE ttrss_feeds SET
site_url = '$site_url' WHERE id = '$feed'"); site_url = '$site_url' WHERE id = '$feed'");
} }
@ -459,11 +460,12 @@
// print "I: " . $rss->channel["image"]["url"]; // print "I: " . $rss->channel["image"]["url"];
if (!$use_simplepie) { if (!$use_simplepie) {
$icon_url = db_escape_string($rss->image["url"]); $icon_url = db_escape_string(trim($rss->image["url"]));
} else { } else {
$icon_url = db_escape_string($rss->get_image_url()); $icon_url = db_escape_string(trim($rss->get_image_url()));
} }
$icon_url = rewrite_relative_url($fetch_url, $icon_url);
$icon_url = substr($icon_url, 0, 250); $icon_url = substr($icon_url, 0, 250);
if ($icon_url && $orig_icon_url != $icon_url) { if ($icon_url && $orig_icon_url != $icon_url) {