diff options
| -rw-r--r-- | backend.php | 37 | ||||
| -rw-r--r-- | tt-rss.css | 3 | ||||
| -rw-r--r-- | tt-rss.js | 26 |
3 files changed, 56 insertions, 10 deletions
diff --git a/backend.php b/backend.php index 40a59afcb..ea5b6a0bb 100644 --- a/backend.php +++ b/backend.php @@ -1642,6 +1642,13 @@ if (!WEB_DEMO_MODE) { $feed_link = db_escape_string(trim($_GET["link"])); + $cat_id = db_escape_string($_GET["cid"]); + + if ($cat_id == "0") { + $cat_qpart = "NULL"; + } else { + $cat_qpart = "'$cat_id'"; + } $result = db_query($link, "SELECT id FROM ttrss_feeds @@ -1650,8 +1657,8 @@ if (db_num_rows($result) == 0) { $result = db_query($link, - "INSERT INTO ttrss_feeds (owner_uid,feed_url,title) - VALUES ('".$_SESSION["uid"]."', '$feed_link', '')"); + "INSERT INTO ttrss_feeds (owner_uid,feed_url,title,cat_id) + VALUES ('".$_SESSION["uid"]."', '$feed_link', '', $cat_qpart)"); $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link' @@ -2714,8 +2721,30 @@ print " Feed URL: <input onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\" - id=\"qafInput\"> - <input class=\"button\" + id=\"qafInput\">"; + + if (get_pref($link, 'ENABLE_FEED_CATS')) { + $result = db_query($link, "SELECT title,id FROM ttrss_feed_categories + WHERE owner_uid = ".$_SESSION["uid"]." + ORDER BY title"); + + print " <select id=\"qafCat\">"; + print "<option id=\"0\">Uncategorized</option>"; + + if (db_num_rows($result) != 0) { + + print "<option disabled>--------</option>"; + + while ($line = db_fetch_assoc($result)) { + printf("<option id='%d'>%s</option>", + $line["id"], $line["title"]); + } + } + + print "</select>"; + } + + print " <input class=\"button\" type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Add feed\"> <input class=\"button\" type=\"submit\" onclick=\"javascript:closeDlg()\" diff --git a/tt-rss.css b/tt-rss.css index 93d04ae73..7ae71d946 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -528,6 +528,9 @@ div.helpResponse { bottom : 2px; right : 2px; background-color : white; + background-image : url("images/vgrad_light_rev2.png"); + background-position : top left; + background-repeat : repeat-x; } #qafInput { @@ -1,16 +1,13 @@ var xmlhttp = false; - var total_unread = 0; var first_run = true; - var display_tags = false; - var global_unread = -1; - var active_title_text = ""; - var current_subtitle = ""; +var _qfd_deleted_feed = 0; + /*@cc_on @*/ /*@if (@_jscript_version >= 5) // JScript gives us Conditional compilation, we can cope with old IE versions. @@ -48,6 +45,12 @@ function dlg_frefresh_callback() { if (xmlhttp.readyState == 4) { notify(xmlhttp.responseText); updateFeedList(false, false); + if (_qfd_deleted_feed) { + var hframe = document.getElementById("headlines-frame"); + if (hframe) { + hframe.src = "backend.php?op=error&msg=No%20feed%20selected."; + } + } closeDlg(); } } @@ -453,13 +456,22 @@ function qafAdd() { notify("Missing feed URL."); } else { notify("Adding feed..."); + + var cat = document.getElementById("qafCat"); + var cat_id = ""; + if (cat) { + cat_id = cat[cat.selectedIndex].id; + } else { + cat_id = 0; + } + var feeds_doc = window.frames["feeds-frame"].document; feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait..."; xmlhttp.open("GET", "backend.php?op=pref-feeds&quiet=1&subop=add&link=" + - param_escape(link.value), true); + param_escape(link.value) + "&cid=" + param_escape(cat_id), true); xmlhttp.onreadystatechange=dlg_frefresh_callback; xmlhttp.send(null); @@ -527,6 +539,8 @@ function qfdDelete(feed_id) { // var feeds_doc = window.frames["feeds-frame"].document; // feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait..."; + _qfd_deleted_feed = feed_id; + xmlhttp.open("GET", "backend.php?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id); xmlhttp.onreadystatechange=dlg_frefresh_callback; xmlhttp.send(null); |