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

add remove_feed() and remove_feed_category()

This commit is contained in:
Andrew Dolgov 2009-12-28 12:04:21 +03:00
parent 5163fc709e
commit 7e329f13ab
2 changed files with 31 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
functions.php
View File

@ -6316,4 +6316,31 @@
} }
} }
} }
function remove_feed($link, $id, $owner_uid) {
if ($id > 0) {
db_query($link, "DELETE FROM ttrss_feeds
WHERE id = '$id' AND owner_uid = $owner_uid");
if (file_exists(ICONS_DIR . "/$id.ico")) {
unlink(ICONS_DIR . "/$id.ico");
}
ccache_remove($link, $id, $owner_uid);
} else {
label_remove($link, -11-$id, $owner_uid);
ccache_remove($link, -11-$id, $owner_uid);
}
}
function remove_feed_category($link, $id, $owner_uid) {
db_query($link, "DELETE FROM ttrss_feed_categories
WHERE id = '$id' AND owner_uid = $owner_uid");
ccache_remove($link, $id, $owner_uid, true);
}
?> ?>

49
modules/pref-feeds.php
View File

@ -729,24 +729,7 @@
$ids = split(",", db_escape_string($_GET["ids"])); $ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) { foreach ($ids as $id) {
remove_feed($link, $id, $_SESSION["uid"]);
if ($id > 0) {
db_query($link, "DELETE FROM ttrss_feeds
WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
$icons_dir = ICONS_DIR;
if (file_exists($icons_dir . "/$id.ico")) {
unlink($icons_dir . "/$id.ico");
}
ccache_remove($link, $id, $_SESSION["uid"]);
} else {
label_remove($link, -11-$id, $_SESSION["uid"]);
ccache_remove($link, -11-$id, $_SESSION["uid"]);
}
} }
} }
@ -1017,34 +1000,10 @@
if ($action == "remove") { if ($action == "remove") {
if (!WEB_DEMO_MODE) { $ids = split(",", db_escape_string($_GET["ids"]));
$ids = split(",", db_escape_string($_GET["ids"])); foreach ($ids as $id) {
remove_feed_category($link, $id, $_SESSION["uid"]);
foreach ($ids as $id) {
db_query($link, "BEGIN");
$result = db_query($link,
"SELECT count(id) as num_feeds FROM ttrss_feeds
WHERE cat_id = '$id'");
$num_feeds = db_fetch_result($result, 0, "num_feeds");
if ($num_feeds == 0) {
db_query($link, "DELETE FROM ttrss_feed_categories
WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
ccache_remove($link, $id, $_SESSION["uid"], true);
} else {
print format_warning(__("Unable to delete non empty feed categories."));
}
db_query($link, "COMMIT");
}
} }
} }