public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 01:25:56 +00:00
Code Issues Releases Wiki Activity

feeds: unify naming

Browse Source
This commit is contained in:
Andrew Dolgov
2021-02-15 15:43:07 +03:00
parent 6b006a18e7
commit 020f062a76
16 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
classes/opml.php
View File

@@ -31,7 +31,7 @@ class OPML extends Handler_Protected {
<body class='claro ttrss_utility'>
<h1>".__('OPML Utility')."</h1><div class='content'>";
Feeds::add_feed_category("Imported feeds");
Feeds::_add_cat("Imported feeds");
$this->opml_notice(__("Importing OPML..."));
@@ -205,7 +205,7 @@ class OPML extends Handler_Protected {
if (!$tmp_line["match_on"]) {
if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) {
$tmp_line["feed"] = Feeds::getFeedTitle(
$tmp_line["feed"] = Feeds::_get_title(
$cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"],
$cat_filter);
} else {
@@ -218,13 +218,13 @@ class OPML extends Handler_Protected {
if (strpos($feed_id, "CAT:") === 0) {
$feed_id = (int)substr($feed_id, 4);
if ($feed_id) {
array_push($match, [Feeds::getCategoryTitle($feed_id), true, false]);
array_push($match, [Feeds::_get_cat_title($feed_id), true, false]);
} else {
array_push($match, [0, true, true]);
}
} else {
if ($feed_id) {
array_push($match, [Feeds::getFeedTitle((int)$feed_id), false, false]);
array_push($match, [Feeds::_get_title((int)$feed_id), false, false]);
} else {
array_push($match, [0, false, true]);
}
@@ -523,7 +523,7 @@ class OPML extends Handler_Protected {
$order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue;
if (!$order_id) $order_id = 0;
Feeds::add_feed_category($cat_title, $parent_id, $order_id);
Feeds::_add_cat($cat_title, $parent_id, $order_id);
$cat_id = $this->get_feed_category($cat_title, $parent_id);
}
@@ -638,7 +638,7 @@ class OPML extends Handler_Protected {
$url_path = get_self_url_prefix();
$url_path .= "/opml.php?op=publish&key=" .
Feeds::get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]);
Feeds::_get_access_key('OPML:Publish', false, $_SESSION["uid"]);
return $url_path;
}