diff options
| -rw-r--r-- | backend.php | 5 | ||||
| -rw-r--r-- | prefs.js | 96 | ||||
| -rw-r--r-- | tt-rss.js | 11 |
3 files changed, 71 insertions, 41 deletions
diff --git a/backend.php b/backend.php index 4831c201b..790a016cb 100644 --- a/backend.php +++ b/backend.php @@ -353,7 +353,7 @@ while ($line = db_fetch_assoc($result)) { - $feed = $line["title"]; + $feed = db_unescape_string($line["title"]); $feed_id = $line["id"]; $subop = $_GET["subop"]; @@ -2986,7 +2986,8 @@ name=\"subop\" value=\"Save configuration\">"; print " <input class=\"button\" type=\"submit\" - name=\"subop\" value=\"Reset to defaults\"></p>"; + name=\"subop\" onclick=\"return validatePrefsReset()\" + value=\"Reset to defaults\"></p>"; print "</form>"; @@ -486,13 +486,16 @@ function removeSelectedLabels() { if (sel_rows.length > 0) { - notify("Removing selected labels..."); - - xmlhttp.open("GET", "backend.php?op=pref-labels&subop=remove&ids="+ - param_escape(sel_rows.toString()), true); - xmlhttp.onreadystatechange=labellist_callback; - xmlhttp.send(null); + var ok = confirm("Remove selected labels?"); + if (ok) { + notify("Removing selected labels..."); + + xmlhttp.open("GET", "backend.php?op=pref-labels&subop=remove&ids="+ + param_escape(sel_rows.toString()), true); + xmlhttp.onreadystatechange=labellist_callback; + xmlhttp.send(null); + } } else { notify("Please select some labels first."); } @@ -509,12 +512,16 @@ function removeSelectedUsers() { if (sel_rows.length > 0) { - notify("Removing selected users..."); + var ok = confirm("Remove selected users?"); - xmlhttp.open("GET", "backend.php?op=pref-users&subop=remove&ids="+ - param_escape(sel_rows.toString()), true); - xmlhttp.onreadystatechange=userlist_callback; - xmlhttp.send(null); + if (ok) { + notify("Removing selected users..."); + + xmlhttp.open("GET", "backend.php?op=pref-users&subop=remove&ids="+ + param_escape(sel_rows.toString()), true); + xmlhttp.onreadystatechange=userlist_callback; + xmlhttp.send(null); + } } else { notify("Please select some labels first."); @@ -532,13 +539,16 @@ function removeSelectedFilters() { if (sel_rows.length > 0) { - notify("Removing selected filters..."); - - xmlhttp.open("GET", "backend.php?op=pref-filters&subop=remove&ids="+ - param_escape(sel_rows.toString()), true); - xmlhttp.onreadystatechange=filterlist_callback; - xmlhttp.send(null); + var ok = confirm("Remove selected filters?"); + if (ok) { + notify("Removing selected filters..."); + + xmlhttp.open("GET", "backend.php?op=pref-filters&subop=remove&ids="+ + param_escape(sel_rows.toString()), true); + xmlhttp.onreadystatechange=filterlist_callback; + xmlhttp.send(null); + } } else { notify("Please select some filters first."); } @@ -556,12 +566,17 @@ function removeSelectedFeeds() { if (sel_rows.length > 0) { - notify("Removing selected feeds..."); + var ok = confirm("Remove selected feeds?"); - xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=remove&ids="+ - param_escape(sel_rows.toString()), true); - xmlhttp.onreadystatechange=feedlist_callback; - xmlhttp.send(null); + if (ok) { + + notify("Removing selected feeds..."); + + xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=remove&ids="+ + param_escape(sel_rows.toString()), true); + xmlhttp.onreadystatechange=feedlist_callback; + xmlhttp.send(null); + } } else { @@ -582,12 +597,16 @@ function removeSelectedFeedCats() { if (sel_rows.length > 0) { - notify("Removing selected categories..."); + var ok = confirm("Remove selected categories?"); - xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=removeCats&ids="+ - param_escape(sel_rows.toString()), true); - xmlhttp.onreadystatechange=feedlist_callback; - xmlhttp.send(null); + if (ok) { + notify("Removing selected categories..."); + + xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=removeCats&ids="+ + param_escape(sel_rows.toString()), true); + xmlhttp.onreadystatechange=feedlist_callback; + xmlhttp.send(null); + } } else { @@ -946,15 +965,18 @@ function resetSelectedUserPass() { return; } - notify("Resetting password for selected user..."); - - var id = rows[0]; - - xmlhttp.open("GET", "backend.php?op=pref-users&subop=resetPass&id=" + - param_escape(id), true); - xmlhttp.onreadystatechange=userlist_callback; - xmlhttp.send(null); + var ok = confirm("Reset password of selected user?"); + if (ok) { + notify("Resetting password for selected user..."); + + var id = rows[0]; + + xmlhttp.open("GET", "backend.php?op=pref-users&subop=resetPass&id=" + + param_escape(id), true); + xmlhttp.onreadystatechange=userlist_callback; + xmlhttp.send(null); + } } function selectedUserDetails() { @@ -1248,3 +1270,7 @@ function categorizeSelectedFeeds() { } } + +function validatePrefsReset() { + return confirm("Reset to defaults?"); +} @@ -438,8 +438,11 @@ function quickMenuGo() { notify("Please select some feed first."); return; } + + if (confirm("Remove current feed?")) { + qfdDelete(actid); + } - displayDlg("quickDelFeed", actid); return; } @@ -546,10 +549,10 @@ function qfdDelete(feed_id) { notify("Removing feed..."); - var feeds_doc = window.frames["feeds-frame"].document; - feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait..."; +// 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&subop=remove&ids=" + 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); } |