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

move label stuff to Labels class

Browse Source 
fix some unresolved functions
This commit is contained in:
Andrew Dolgov
2017-05-04 15:57:40 +03:00
parent c2f0f24e4c
commit 7c9b5a3fe4
13 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
classes/api.php
View File

@@ -458,14 +458,14 @@ class API extends Handler {
$checked = false;
foreach ($article_labels as $al) {
if (feed_to_label_id($al[0]) == $line['id']) {
if (Labels::feed_to_label_id($al[0]) == $line['id']) {
$checked = true;
break;
}
}
array_push($rv, array(
"id" => (int)label_to_feed_id($line['id']),
"id" => (int)Labels::label_to_feed_id($line['id']),
"caption" => $line['caption'],
"fg_color" => $line['fg_color'],
"bg_color" => $line['bg_color'],
@@ -481,8 +481,8 @@ class API extends Handler {
$label_id = (int) $this->dbh->escape_string($_REQUEST['label_id']);
$assign = (bool) ($this->dbh->escape_string($_REQUEST['assign']) == "true");
$label = $this->dbh->escape_string(label_find_caption(
feed_to_label_id($label_id), $_SESSION["uid"]));
$label = $this->dbh->escape_string(Labels::find_caption(
Labels::feed_to_label_id($label_id), $_SESSION["uid"]));
$num_updated = 0;
@@ -491,9 +491,9 @@ class API extends Handler {
foreach ($article_ids as $id) {
if ($assign)
label_add_article($id, $label, $_SESSION["uid"]);
Labels::add_article($id, $label, $_SESSION["uid"]);
else
label_remove_article($id, $label, $_SESSION["uid"]);
Labels::remove_article($id, $label, $_SESSION["uid"]);
++$num_updated;