public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 10:05: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

24
classes/pref/feeds.php
View File

@@ -98,7 +98,7 @@ class Pref_Feeds extends Handler_Protected {
$feed['checkbox'] = false;
$feed['unread'] = -1;
$feed['error'] = $feed_line['last_error'];
$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
$feed['icon'] = Feeds::_get_icon($feed_line['id']);
$feed['param'] = TimeHelper::make_local_datetime(
$feed_line['last_updated'], true);
$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
@@ -266,7 +266,7 @@ class Pref_Feeds extends Handler_Protected {
$feed['name'] = $feed_line['title'];
$feed['checkbox'] = false;
$feed['error'] = $feed_line['last_error'];
$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
$feed['icon'] = Feeds::_get_icon($feed_line['id']);
$feed['param'] = TimeHelper::make_local_datetime(
$feed_line['last_updated'], true);
$feed['unread'] = -1;
@@ -301,7 +301,7 @@ class Pref_Feeds extends Handler_Protected {
$feed['name'] = $feed_line['title'];
$feed['checkbox'] = false;
$feed['error'] = $feed_line['last_error'];
$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
$feed['icon'] = Feeds::_get_icon($feed_line['id']);
$feed['param'] = TimeHelper::make_local_datetime(
$feed_line['last_updated'], true);
$feed['unread'] = -1;
@@ -777,7 +777,7 @@ class Pref_Feeds extends Handler_Protected {
/* Icon */
print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::getFeedIcon($feed_id)."\">";
print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::_get_icon($feed_id)."\">";
print "<form onsubmit='return false;' id='feed_icon_upload_form'
enctype='multipart/form-data' method='POST'>
@@ -1189,7 +1189,7 @@ class Pref_Feeds extends Handler_Protected {
function addCat() {
$feed_cat = clean($_REQUEST["cat"]);
Feeds::add_feed_category($feed_cat);
Feeds::_add_cat($feed_cat);
}
function importOpml() {
@@ -1420,9 +1420,9 @@ class Pref_Feeds extends Handler_Protected {
$obj['id'] = 'CAT:' . $cat_id;
$obj['items'] = array();
$obj['name'] = Feeds::getCategoryTitle($cat_id);
$obj['name'] = Feeds::_get_cat_title($cat_id);
$obj['type'] = 'category';
$obj['unread'] = -1; //(int) Feeds::getCategoryUnread($cat_id);
$obj['unread'] = -1; //(int) Feeds::_get_cat_unread($cat_id);
$obj['bare_id'] = $cat_id;
return $obj;
@@ -1433,7 +1433,7 @@ class Pref_Feeds extends Handler_Protected {
$feed_id = (int) $feed_id;
if (!$title)
$title = Feeds::getFeedTitle($feed_id, false);
$title = Feeds::_get_title($feed_id, false);
if ($unread === false)
$unread = getFeedUnread($feed_id, false);
@@ -1444,7 +1444,7 @@ class Pref_Feeds extends Handler_Protected {
$obj['type'] = 'feed';
$obj['error'] = $error;
$obj['updated'] = $updated;
$obj['icon'] = Feeds::getFeedIcon($feed_id);
$obj['icon'] = Feeds::_get_icon($feed_id);
$obj['bare_id'] = $feed_id;
$obj['auxcounter'] = 0;
@@ -1611,11 +1611,11 @@ class Pref_Feeds extends Handler_Protected {
'id' => $feed_id,
'is_cat' => (int)$is_cat,
'q' => $search,
'key' => Feeds::get_feed_access_key($feed_id, $is_cat, $_SESSION["uid"])
'key' => Feeds::_get_access_key($feed_id, $is_cat, $_SESSION["uid"])
]);
print json_encode([
"title" => Feeds::getFeedTitle($feed_id, $is_cat),
"title" => Feeds::_get_title($feed_id, $is_cat),
"link" => $link
]);
}
@@ -1627,7 +1627,7 @@ class Pref_Feeds extends Handler_Protected {
WHERE feed_id = ? AND is_cat = ? AND owner_uid = ?");
$sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]);
return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid);
return Feeds::_get_access_key($feed_id, $is_cat, $owner_uid);
}
// Silent

12
classes/pref/filters.php
View File

@@ -189,10 +189,10 @@ class Pref_Filters extends Handler_Protected {
if (strpos($feed_id, "CAT:") === 0) {
$feed_id = (int)substr($feed_id, 4);
array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
array_push($feeds_fmt, Feeds::_get_cat_title($feed_id));
} else {
if ($feed_id)
array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
array_push($feeds_fmt, Feeds::_get_title((int)$feed_id));
else
array_push($feeds_fmt, __("All feeds"));
}
@@ -203,9 +203,9 @@ class Pref_Filters extends Handler_Protected {
} else {
$where = $line["cat_filter"] ?
Feeds::getCategoryTitle($line["cat_id"]) :
Feeds::_get_cat_title($line["cat_id"]) :
($line["feed_id"] ?
Feeds::getFeedTitle($line["feed_id"]) : __("All feeds"));
Feeds::_get_title($line["feed_id"]) : __("All feeds"));
}
# $where = $line["cat_id"] . "/" . $line["feed_id"];
@@ -494,10 +494,10 @@ class Pref_Filters extends Handler_Protected {
if (strpos($feed_id, "CAT:") === 0) {
$feed_id = (int)substr($feed_id, 4);
array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
array_push($feeds_fmt, Feeds::_get_cat_title($feed_id));
} else {
if ($feed_id)
array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
array_push($feeds_fmt, Feeds::_get_title((int)$feed_id));
else
array_push($feeds_fmt, __("All feeds"));
}