From dd0a17b07a8fa30d28ccf70f225b14e6139f7336 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 11 Sep 2012 20:16:44 +0400 Subject: [PATCH] opml fixes --- classes/opml.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/classes/opml.php b/classes/opml.php index f3dbcd81..41f48df0 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -211,7 +211,7 @@ class Opml extends Handler_Protected { unset($line["owner_uid"]); $filter = json_encode($line); - $out .= "$filter"; + $out .= ""; } @@ -238,12 +238,12 @@ class Opml extends Handler_Protected { $res = $doc->saveXML(); - // saveXML uses a two-space indent. Change to tabs. +/* // saveXML uses a two-space indent. Change to tabs. $res = preg_replace_callback('/^(?: )+/mu', create_function( '$matches', 'return str_repeat("\t", intval(strlen($matches[0])/2));'), - $res); + $res); */ print $res; } @@ -269,10 +269,12 @@ class Opml extends Handler_Protected { #$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id"); $this->opml_notice(T_sprintf("Adding feed: %s", $feed_title)); + if (!$cat_id) $cat_id = 'NULL'; + $query = "INSERT INTO ttrss_feeds (title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES ('$feed_title', '$feed_url', '$owner_uid', - '$cat_id', '$site_url', 0)"; + $cat_id, '$site_url', 0)"; db_query($this->link, $query); } else { @@ -291,7 +293,7 @@ class Opml extends Handler_Protected { if (!label_find_id($this->link, $label_name, $_SESSION['uid'])) { $this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name))); - label_create($this->link, $label_name, $fg_color, $bg_color); + label_create($this->link, $label_name, $fg_color, $bg_color, $owner_uid); } else { $this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name))); } -- 2.39.5