block unsubscribe requests for virtual feeds

This commit is contained in:
Andrew Dolgov 2009-01-18 10:32:45 +01:00
parent bb81a1f367
commit 810b156135
3 changed files with 13 additions and 23 deletions

View File

@ -1836,12 +1836,6 @@
function initialize_user($link, $uid) {
/* db_query($link, "insert into ttrss_labels (owner_uid,sql_exp,description)
values ('$uid','unread = true', 'Unread articles')");
db_query($link, "insert into ttrss_labels (owner_uid,sql_exp,description)
values ('$uid','last_read is null and unread = false', 'Updated articles')"); */
db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
values ('$uid', 'Tiny Tiny RSS: New Releases',
'http://tt-rss.org/releases.rss')");

View File

@ -703,28 +703,19 @@
if ($subop == "remove") {
if (!WEB_DEMO_MODE) {
$ids = split(",", db_escape_string($_GET["ids"]));
$ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
foreach ($ids as $id) {
if ($id > 0) {
if ($id > 0) {
db_query($link, "DELETE FROM ttrss_feeds
WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
db_query($link, "DELETE FROM ttrss_feeds
WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
$icons_dir = ICONS_DIR;
$icons_dir = ICONS_DIR;
if (file_exists($icons_dir . "/$id.ico")) {
unlink($icons_dir . "/$id.ico");
}
} else if ($id < -10) {
$label_id = -$id - 11;
db_query($link, "DELETE FROM ttrss_labels
WHERE id = '$label_id' AND owner_uid = " . $_SESSION["uid"]);
if (file_exists($icons_dir . "/$id.ico")) {
unlink($icons_dir . "/$id.ico");
}
}
}

View File

@ -562,6 +562,11 @@ function quickMenuGo(opid) {
return;
}
if (actid <= 0) {
alert(__("You can't unsubscribe from this kind of feed."));
return;
}
if (!actid) {
alert(__("Please select some feed first."));
return;