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

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

This commit is contained in:
Andrew Dolgov 2012-09-11 23:13:52 +04:00
parent c08367f944 ef645ff05e
commit 50634356ab
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
classes/opml.php
View File

@ -211,7 +211,7 @@ class Opml extends Handler_Protected {
unset($line["owner_uid"]); unset($line["owner_uid"]);
$filter = json_encode($line); $filter = json_encode($line);
$out .= "<outline filter-type=\"2\">$filter</outline>"; $out .= "<outline filter-type=\"2\"><![CDATA[$filter]]></outline>";
} }
@ -238,12 +238,12 @@ class Opml extends Handler_Protected {
$res = $doc->saveXML(); $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', $res = preg_replace_callback('/^(?: )+/mu',
create_function( create_function(
'$matches', '$matches',
'return str_repeat("\t", intval(strlen($matches[0])/2));'), 'return str_repeat("\t", intval(strlen($matches[0])/2));'),
$res); $res); */
print $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("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
$this->opml_notice(T_sprintf("Adding feed: %s", $feed_title)); $this->opml_notice(T_sprintf("Adding feed: %s", $feed_title));
if (!$cat_id) $cat_id = 'NULL';
$query = "INSERT INTO ttrss_feeds $query = "INSERT INTO ttrss_feeds
(title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES (title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES
('$feed_title', '$feed_url', '$owner_uid', ('$feed_title', '$feed_url', '$owner_uid',
'$cat_id', '$site_url', 0)"; $cat_id, '$site_url', 0)";
db_query($this->link, $query); db_query($this->link, $query);
} else { } else {
@ -291,7 +293,7 @@ class Opml extends Handler_Protected {
if (!label_find_id($this->link, $label_name, $_SESSION['uid'])) { if (!label_find_id($this->link, $label_name, $_SESSION['uid'])) {
$this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name))); $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 { } else {
$this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name))); $this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
} }