subop -> method

[tt-rss.git] / js / prefs.js

diff --git a/js/prefs.js b/js/prefs.js
index e40d6d7234a9e3cc255b0df5280c2bf71aa25f63..760441a3d81e575ef2697dd5b1e99eab5148bdd8 100644 (file)
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -124,7 +124,7 @@ function addUser() {
 
                notify_progress("Adding user...");
 
-               var query = "?op=pref-users&subop=add&login=" +
+               var query = "?op=pref-users&method=add&login=" +
                        param_escape(login);
 
                new Ajax.Request("backend.php", {
@@ -148,7 +148,7 @@ function editUser(id, event) {
                selectTableRows('prefUserList', 'none');
                selectTableRowById('UMRR-'+id, 'UMCHK-'+id, true);
 
-               var query = "?op=pref-users&subop=edit&id=" +
+               var query = "?op=pref-users&method=edit&id=" +
                        param_escape(id);
 
                new Ajax.Request("backend.php", {
@@ -173,7 +173,7 @@ function editUser(id, event) {
 function editFilter(id) {
        try {
 
-               var query = "backend.php?op=pref-filters&subop=edit&id=" + param_escape(id);
+               var query = "backend.php?op=pref-filters&method=edit&id=" + param_escape(id);
 
                if (dijit.byId("filterEditDlg"))
                        dijit.byId("filterEditDlg").destroyRecursive();
@@ -193,7 +193,7 @@ function editFilter(id) {
 
                                        var id = this.attr('value').id;
 
-                                       var query = "?op=pref-filters&subop=remove&ids="+
+                                       var query = "?op=pref-filters&method=remove&ids="+
                                                param_escape(id);
 
                                        new Ajax.Request("backend.php", {
@@ -224,7 +224,7 @@ function editFilter(id) {
                        execute: function() {
                                if (this.validate()) {
 
-                                       var query = "?op=rpc&subop=verifyRegexp&reg_exp=" +
+                                       var query = "?op=rpc&method=verifyRegexp&reg_exp=" +
                                                param_escape(dialog.attr('value').reg_exp);
 
                                        notify_progress("Verifying regular expression...");
@@ -323,7 +323,7 @@ function removeSelectedLabels() {
                if (ok) {
                        notify_progress("Removing selected labels...");
 
-                       var query = "?op=pref-labels&subop=remove&ids="+
+                       var query = "?op=pref-labels&method=remove&ids="+
                                param_escape(sel_rows.toString());
 
                        new Ajax.Request("backend.php", {
@@ -353,7 +353,7 @@ function removeSelectedUsers() {
                        if (ok) {
                                notify_progress("Removing selected users...");
 
-                               var query = "?op=pref-users&subop=remove&ids="+
+                               var query = "?op=pref-users&method=remove&ids="+
                                        param_escape(sel_rows.toString());
 
                                new Ajax.Request("backend.php", {
@@ -388,7 +388,7 @@ function removeSelectedFilters() {
                        if (ok) {
                                notify_progress("Removing selected filters...");
 
-                               var query = "?op=pref-filters&subop=remove&ids="+
+                               var query = "?op=pref-filters&method=remove&ids="+
                                        param_escape(sel_rows.toString());
 
                                new Ajax.Request("backend.php", {
@@ -423,7 +423,7 @@ function removeSelectedFeeds() {
 
                                notify_progress("Unsubscribing from selected feeds...", true);
 
-                               var query = "?op=pref-feeds&subop=remove&ids="+
+                               var query = "?op=pref-feeds&method=remove&ids="+
                                        param_escape(sel_rows.toString());
 
                                console.log(query);
@@ -484,7 +484,7 @@ function purgeSelectedFeeds() {
                if (pr != undefined) {
                        notify_progress("Purging selected feed...");
 
-                       var query = "?op=rpc&subop=purge&ids="+
+                       var query = "?op=rpc&method=purge&ids="+
                                param_escape(sel_rows.toString()) + "&days=" + pr;
 
                        console.log(query);
@@ -583,7 +583,7 @@ function resetSelectedUserPass() {
 
                        var id = rows[0];
 
-                       var query = "?op=pref-users&subop=resetPass&id=" +
+                       var query = "?op=pref-users&method=resetPass&id=" +
                                param_escape(id);
 
                        new Ajax.Request("backend.php", {
@@ -619,7 +619,7 @@ function selectedUserDetails() {
 
                var id = rows[0];
 
-               var query = "?op=pref-users&subop=user-details&id=" + id;
+               var query = "?op=pref-users&method=user-details&id=" + id;
 
                new Ajax.Request("backend.php", {
                        parameters: query,
@@ -682,7 +682,7 @@ function editSelectedFeeds() {
 
                notify_progress("Loading, please wait...");
 
-               var query = "backend.php?op=pref-feeds&subop=editfeeds&ids=" +
+               var query = "backend.php?op=pref-feeds&method=editfeeds&ids=" +
                        param_escape(rows.toString());
 
                console.log(query);
@@ -863,7 +863,7 @@ function updatePrefsList() {
                } });
 }
 
-function selectTab(id, noupdate, subop) {
+function selectTab(id, noupdate, method) {
        try {
                if (!noupdate) {
                        notify_progress("Loading, please wait...");
@@ -905,10 +905,10 @@ function init_second_stage() {
                                if (tab) dijit.byId("pref-tabs").selectChild(tab);
                        }
 
-                       var subop = getURLParam('subop');
+                       var method = getURLParam('method');
 
-                       if (subop == 'editFeed') {
-                               var param = getURLParam('subopparam');
+                       if (method == 'editFeed') {
+                               var param = getURLParam('methodparam');
 
                                window.setTimeout('editFeed(' + param + ')', 100);
                        }
@@ -938,7 +938,7 @@ function init() {
                        loading_set_progress(50);
 
                        new Ajax.Request("backend.php", {
-                               parameters: {op: "rpc", subop: "sanityCheck"},
+                               parameters: {op: "rpc", method: "sanityCheck"},
                                        onComplete: function(transport) {
                                        backend_sanity_check_callback(transport);
                                } });
@@ -955,7 +955,7 @@ function validatePrefsReset() {
 
                if (ok) {
 
-                       query = "?op=pref-prefs&subop=reset-config";
+                       query = "?op=pref-prefs&method=reset-config";
                        console.log(query);
 
                        new Ajax.Request("backend.php", {
@@ -1160,7 +1160,7 @@ function pref_hotkey_handler(e) {
 
 function editFeedCats() {
        try {
-               var query = "backend.php?op=pref-feeds&subop=editCats";
+               var query = "backend.php?op=pref-feeds&method=editCats";
 
                if (dijit.byId("feedCatEditDlg"))
                        dijit.byId("feedCatEditDlg").destroyRecursive();
@@ -1181,7 +1181,7 @@ function editFeedCats() {
                                        if (ok) {
                                                notify_progress("Removing selected categories...", true);
 
-                                               var query = "?op=pref-feeds&subop=editCats&action=remove&ids="+
+                                               var query = "?op=pref-feeds&method=editCats&action=remove&ids="+
                                                        param_escape(sel_rows.toString());
 
                                                new Ajax.Request("backend.php", {
@@ -1202,7 +1202,7 @@ function editFeedCats() {
                                if (this.validate()) {
                                        notify_progress("Creating category...");
 
-                                       var query = "?op=pref-feeds&subop=editCats&action=add&cat=" +
+                                       var query = "?op=pref-feeds&method=editCats&action=add&cat=" +
                                                param_escape(this.attr('value').newcat);
 
                                        new Ajax.Request("backend.php", {
@@ -1252,7 +1252,7 @@ function showInactiveFeeds() {
                                        if (ok) {
                                                notify_progress("Removing selected feeds...", true);
 
-                                               var query = "?op=pref-feeds&subop=remove&ids="+
+                                               var query = "?op=pref-feeds&method=remove&ids="+
                                                        param_escape(sel_rows.toString());
 
                                                new Ajax.Request("backend.php", {
@@ -1291,7 +1291,7 @@ function opmlRegenKey() {
 
                        notify_progress("Trying to change address...", true);
 
-                       var query = "?op=rpc&subop=regenOPMLKey";
+                       var query = "?op=rpc&method=regenOPMLKey";
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -1376,7 +1376,7 @@ function clearFeedArticles(feed_id) {
 
        notify_progress("Clearing feed...");
 
-       var query = "?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
+       var query = "?op=pref-feeds&quiet=1&method=clear&id=" + feed_id;
 
        new Ajax.Request("backend.php", {
                parameters: query,
@@ -1399,7 +1399,7 @@ function rescoreSelectedFeeds() {
                if (ok) {
                        notify_progress("Rescoring selected feeds...", true);
 
-                       var query = "?op=pref-feeds&subop=rescore&quiet=1&ids="+
+                       var query = "?op=pref-feeds&method=rescore&quiet=1&ids="+
                                param_escape(sel_rows.toString());
 
                        new Ajax.Request("backend.php", {
@@ -1422,7 +1422,7 @@ function rescore_all_feeds() {
        if (ok) {
                notify_progress("Rescoring feeds...", true);
 
-               var query = "?op=pref-feeds&subop=rescoreAll&quiet=1";
+               var query = "?op=pref-feeds&method=rescoreAll&quiet=1";
 
                new Ajax.Request("backend.php", {
                        parameters: query,
@@ -1440,7 +1440,7 @@ function labelColorReset() {
                        var ok = confirm(__("Reset selected labels to default colors?"));
 
                        if (ok) {
-                               var query = "?op=pref-labels&subop=color-reset&ids="+
+                               var query = "?op=pref-labels&method=color-reset&ids="+
                                        param_escape(labels.toString());
 
                                new Ajax.Request("backend.php", {
@@ -1488,7 +1488,7 @@ function editProfiles() {
                                        if (ok) {
                                                notify_progress("Removing selected profiles...", true);
 
-                                               var query = "?op=rpc&subop=remprofiles&ids="+
+                                               var query = "?op=rpc&method=remprofiles&ids="+
                                                        param_escape(sel_rows.toString());
 
                                                new Ajax.Request("backend.php", {
@@ -1514,7 +1514,7 @@ function editProfiles() {
                                        if (ok) {
                                                notify_progress("Loading, please wait...");
 
-                                               var query = "?op=rpc&subop=setprofile&id="+
+                                               var query = "?op=rpc&method=setprofile&id="+
                                                        param_escape(sel_rows.toString());
 
                                                new Ajax.Request("backend.php", {
@@ -1532,7 +1532,7 @@ function editProfiles() {
                                if (this.validate()) {
                                        notify_progress("Creating profile...", true);
 
-                                       var query = "?op=rpc&subop=addprofile&title=" +
+                                       var query = "?op=rpc&method=addprofile&title=" +
                                                param_escape(dialog.attr('value').newprofile);
 
                                        new Ajax.Request("backend.php", {
@@ -1567,7 +1567,7 @@ function activatePrefProfile() {
                if (ok) {
                        notify_progress("Loading, please wait...");
 
-                       var query = "?op=rpc&subop=setprofile&id="+
+                       var query = "?op=rpc&method=setprofile&id="+
                                param_escape(sel_rows.toString());
 
                        new Ajax.Request("backend.php", {
@@ -1591,7 +1591,7 @@ function clearFeedAccessKeys() {
        if (ok) {
                notify_progress("Clearing URLs...");
 
-               var query = "?op=rpc&subop=clearKeys";
+               var query = "?op=rpc&method=clearKeys";
 
                new Ajax.Request("backend.php", {
                        parameters: query,
@@ -1610,7 +1610,7 @@ function clearArticleAccessKeys() {
        if (ok) {
                notify_progress("Clearing URLs...");
 
-               var query = "?op=rpc&subop=clearArticleKeys";
+               var query = "?op=rpc&method=clearArticleKeys";
 
                new Ajax.Request("backend.php", {
                        parameters: query,
@@ -1626,7 +1626,7 @@ function resetFeedOrder() {
                notify_progress("Loading, please wait...");
 
                new Ajax.Request("backend.php", {
-                       parameters: "?op=pref-feeds&subop=feedsortreset",
+                       parameters: "?op=pref-feeds&method=feedsortreset",
                        onComplete: function(transport) {
                                updateFeedList();
                        } });
@@ -1642,7 +1642,7 @@ function resetCatOrder() {
                notify_progress("Loading, please wait...");
 
                new Ajax.Request("backend.php", {
-                       parameters: "?op=pref-feeds&subop=catsortreset",
+                       parameters: "?op=pref-feeds&method=catsortreset",
                        onComplete: function(transport) {
                                updateFeedList();
                        } });
@@ -1664,7 +1664,7 @@ function editCat(id, item, event) {
                        new Ajax.Request("backend.php", {
                        parameters: {
                                op: 'pref-feeds',
-                               subop: 'renamecat',
+                               method: 'renamecat',
                                id: id,
                                title: new_name,
                        },
@@ -1680,7 +1680,7 @@ function editCat(id, item, event) {
 
 function editLabel(id, event) {
        try {
-               var query = "backend.php?op=pref-labels&subop=edit&id=" +
+               var query = "backend.php?op=pref-labels&method=edit&id=" +
                        param_escape(id);
 
                if (dijit.byId("labelEditDlg"))
@@ -1705,7 +1705,7 @@ function editLabel(id, event) {
                                        color = bg;
                                }
 
-                               var query = "?op=pref-labels&subop=color-set&kind="+kind+
+                               var query = "?op=pref-labels&method=color-set&kind="+kind+
                                        "&ids=" + param_escape(id) + "&fg=" + param_escape(fg) +
                                        "&bg=" + param_escape(bg) + "&color=" + param_escape(color);
 
@@ -1756,7 +1756,7 @@ function clearTwitterCredentials() {
                if (ok) {
                        notify_progress("Clearing credentials...");
 
-                       var query = "?op=pref-feeds&subop=remtwitterinfo";
+                       var query = "?op=pref-feeds&method=remtwitterinfo";
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -1826,7 +1826,7 @@ function addInstance() {
                        style: "width: 600px",
                        regenKey: function() {
                                new Ajax.Request("backend.php", {
-                                       parameters: "?op=rpc&subop=genHash",
+                                       parameters: "?op=rpc&method=genHash",
                                        onComplete: function(transport) {
                                                var reply = JSON.parse(transport.responseText);
                                                if (reply)
@@ -1865,7 +1865,7 @@ function editInstance(id, event) {
                selectTableRows('prefInstanceList', 'none');
                selectTableRowById('LIRR-'+id, 'LICHK-'+id, true);
 
-               var query = "backend.php?op=pref-instances&subop=edit&id=" +
+               var query = "backend.php?op=pref-instances&method=edit&id=" +
                        param_escape(id);
 
                if (dijit.byId("instanceEditDlg"))
@@ -1877,7 +1877,7 @@ function editInstance(id, event) {
                        style: "width: 600px",
                        regenKey: function() {
                                new Ajax.Request("backend.php", {
-                                       parameters: "?op=rpc&subop=genHash",
+                                       parameters: "?op=rpc&method=genHash",
                                        onComplete: function(transport) {
                                                var reply = JSON.parse(transport.responseText);
                                                if (reply)
@@ -1927,7 +1927,7 @@ function removeSelectedInstances() {
                        if (ok) {
                                notify_progress("Removing selected instances...");
 
-                               var query = "?op=pref-instances&subop=remove&ids="+
+                               var query = "?op=pref-instances&method=remove&ids="+
                                        param_escape(sel_rows.toString());
 
                                new Ajax.Request("backend.php", {