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

move some label stuff to labels.php 

move getfeedcategory() to Feeds
This commit is contained in:
Andrew Dolgov 2017-05-04 15:36:36 +03:00
parent 904aff7667
commit 0086a89740
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes/feeds.php
View File

@ -2184,5 +2184,18 @@ class Feeds extends Handler_Protected {
return $rv;
}
static function getFeedCategory($feed) {
$result = db_query("SELECT cat_id FROM ttrss_feeds
WHERE id = '$feed'");
if (db_num_rows($result) > 0) {
return db_fetch_result($result, 0, "cat_id");
} else {
return false;
}
}
}

22
include/functions.php
View File

@ -2010,7 +2010,7 @@
function load_filters($feed_id, $owner_uid) {
$filters = array();
$cat_id = (int)getFeedCategory($feed_id);
$cat_id = (int)Feeds::getFeedCategory($feed_id);
if ($cat_id == 0)
$null_cat_qpart = "cat_id IS NULL OR";
@ -2482,18 +2482,6 @@
return null;
}
function getFeedCategory($feed) {
$result = db_query("SELECT cat_id FROM ttrss_feeds
WHERE id = '$feed'");
if (db_num_rows($result) > 0) {
return db_fetch_result($result, 0, "cat_id");
} else {
return false;
}
}
function implements_interface($class, $interface) {
return in_array($interface, class_implements($class));
}
@ -2588,14 +2576,6 @@
}
}
function label_to_feed_id($label) {
return LABEL_BASE_INDEX - 1 - abs($label);
}
function feed_to_label_id($feed) {
return LABEL_BASE_INDEX - 1 + abs($feed);
}
function get_theme_path($theme) {
$check = "themes/$theme";
if (file_exists($check)) return $check;

8
include/labels.php
View File

@ -1,4 +1,12 @@
<?php
function label_to_feed_id($label) {
return LABEL_BASE_INDEX - 1 - abs($label);
}
function feed_to_label_id($feed) {
return LABEL_BASE_INDEX - 1 + abs($feed);
}
function label_find_id($label, $owner_uid) {
$result = db_query(
"SELECT id FROM ttrss_labels2 WHERE caption = '$label'