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

opml import: add workaround for broken OPML files using title instead of text (refs #509)

This commit is contained in:
Andrew Dolgov 2012-11-12 16:13:34 +04:00
parent a9796b2648
commit cc616ea162
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
classes/opml.php
View File

@ -388,6 +388,9 @@ class Opml extends Handler_Protected {
if ($root_node) { if ($root_node) {
$cat_title = db_escape_string($root_node->attributes->getNamedItem('text')->nodeValue); $cat_title = db_escape_string($root_node->attributes->getNamedItem('text')->nodeValue);
if (!$cat_title)
$cat_title = db_escape_string($root_node->attributes->getNamedItem('title')->nodeValue);
if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) { if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
$cat_id = get_feed_category($this->link, $cat_title, $parent_id); $cat_id = get_feed_category($this->link, $cat_title, $parent_id);
db_query($this->link, "BEGIN"); db_query($this->link, "BEGIN");
@ -416,6 +419,10 @@ class Opml extends Handler_Protected {
if ($node->hasAttributes() && strtolower($node->tagName) == "outline") { if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
$attrs = $node->attributes; $attrs = $node->attributes;
$node_cat_title = db_escape_string($attrs->getNamedItem('text')->nodeValue); $node_cat_title = db_escape_string($attrs->getNamedItem('text')->nodeValue);
if (!$node_cat_title)
$node_cat_title = db_escape_string($attrs->getNamedItem('title')->nodeValue);
$node_feed_url = db_escape_string($attrs->getNamedItem('xmlUrl')->nodeValue); $node_feed_url = db_escape_string($attrs->getNamedItem('xmlUrl')->nodeValue);
if ($node_cat_title && !$node_feed_url) { if ($node_cat_title && !$node_feed_url) {