]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
prefs: add button to clear all generated URLs
[tt-rss.git] / prefs.js
index 2a82ae692a384a86eb431eacbe00e5cf51df0077..33ed8fd767ebb2b9829b22ff0e759ef74a61133e 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -4,7 +4,6 @@ var active_tab = false;
 var init_params = new Array();
 
 var caller_subop = false;
-var sanity_check_done = false;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
 
@@ -12,6 +11,9 @@ var color_picker_active = false;
 var selection_disabled = false;
 var mouse_is_down = false;
 
+var db = false;
+var store = false;
+
 function feedlist_callback2(transport) {
 
        try {   
@@ -165,6 +167,7 @@ function infobox_feed_cat_callback2(transport) {
        try {
                infobox_callback2(transport);
                init_cat_inline_editor();
+               $('fadd_cat').focus();
        } catch (e) {
                exception_error("infobox_feed_cat_callback2", e);
        }
@@ -223,38 +226,6 @@ function updateUsersList(sort_key) {
        }
 }
 
-function addLabel() {
-
-       try {
-
-               var caption = prompt(__("Please enter label caption:"), "");
-       
-               if (caption == null) { 
-                       return false;
-               }
-       
-               if (caption == "") {
-                       alert(__("Can't create label: missing caption."));
-                       return false;
-               }
-       
-               // we can be called from some other tab
-               active_tab = "labelConfig";
-       
-               query = "?op=pref-labels&subop=add&caption=" + 
-                       param_escape(caption);
-       
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_submit_callback2(transport);
-                               } });
-
-       } catch (e) {
-               exception_error("addLabel", e);
-       }
-}
-
 function addFeed() {
 
        try {
@@ -374,8 +345,6 @@ function editUser(id) {
                selectTableRowsByIdPrefix('prefUserList', 'UMRR-', 'UMCHK-', false);
                selectTableRowById('UMRR-'+id, 'UMCHK-'+id, true);
 
-               disableContainerChildren("userOpToolbar", false);
-
                var query = "?op=pref-users&subop=edit&id=" +
                        param_escape(id);
 
@@ -383,6 +352,7 @@ function editUser(id) {
                        parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
+                                       document.forms['user_edit_form'].login.focus(); 
                                } });
 
        } catch (e) {
@@ -399,8 +369,6 @@ function editFilter(id) {
 
                notify_progress("Loading, please wait...");
 
-               disableContainerChildren("filterOpToolbar", false);
-
                selectTableRowsByIdPrefix('prefFilterList', 'FILRR-', 'FICHK-', false);
                selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
 
@@ -411,6 +379,7 @@ function editFilter(id) {
                        parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
+                                       document.forms['filter_edit_form'].reg_exp.focus();
                                } });
        } catch (e) {
                exception_error("editFilter", e);
@@ -429,8 +398,6 @@ function editFeed(feed) {
                selectTableRowsByIdPrefix('prefFeedList', 'FEEDR-', 'FRCHK-', false);
                selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
        
-               disableContainerChildren("feedOpToolbar", false);
-       
                var query = "?op=pref-feeds&subop=editfeed&id=" +
                        param_escape(feed);
        
@@ -438,6 +405,7 @@ function editFeed(feed) {
                        parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
+                                       document.forms["edit_feed_form"].title.focus();
                                } });
 
        } catch (e) {
@@ -502,7 +470,7 @@ function removeSelectedUsers() {
        
                if (sel_rows.length > 0) {
        
-                       var ok = confirm(__("Remove selected users?"));
+                       var ok = confirm(__("Remove selected users? Neither default admin nor your account will be removed."));
        
                        if (ok) {
                                notify_progress("Removing selected users...");
@@ -581,7 +549,7 @@ function removeSelectedFeeds() {
                                var query = "?op=pref-feeds&subop=remove&ids="+
                                        param_escape(sel_rows.toString());
 
-                               debug(query);
+                               console.log(query);
 
                                new Ajax.Request("backend.php", {
                                        parameters: query,
@@ -642,7 +610,7 @@ function purgeSelectedFeeds() {
                        var query = "?op=rpc&subop=purge&ids="+
                                param_escape(sel_rows.toString()) + "&days=" + pr;
 
-                       debug(query);
+                       console.log(query);
 
                        new Ajax.Request("prefs.php",   {
                                parameters: query,
@@ -988,7 +956,7 @@ function editSelectedFeeds() {
 
 function piggie(enable) {
        if (enable) {
-               debug("I LOVEDED IT!");
+               console.log("I LOVEDED IT!");
                var piggie = $("piggie");
 
                Element.show(piggie);
@@ -1006,10 +974,9 @@ function opmlImport() {
                alert(__("No OPML file to upload."));
                return false;
        } else {
+               notify_progress("Importing, please wait...", true);
                return true;
        }
-
-       notify_progress("Importing, please wait...", true);
 }
 
 function updateFilterList(sort_key) {
@@ -1087,7 +1054,7 @@ function selectTab(id, noupdate, subop) {
 
                if (!noupdate) {
 
-                       debug("selectTab: " + id + "(NU: " + noupdate + ")");
+                       console.log("selectTab: " + id + "(NU: " + noupdate + ")");
        
                        notify_progress("Loading, please wait...");
        
@@ -1142,62 +1109,6 @@ function selectTab(id, noupdate, subop) {
        }
 }
 
-function backend_sanity_check_callback2(transport) {
-
-       try {
-
-               if (sanity_check_done) {
-                       fatalError(11, "Sanity check request received twice. This can indicate "+
-                     "presence of Firebug or some other disrupting extension. "+
-                               "Please disable it and try again.");
-                       return;
-               }
-
-               if (!transport.responseXML) {
-                       fatalError(3, "Sanity Check: Received reply is not XML", 
-                               transport.responseText);
-                       return;
-               }
-
-               var reply = transport.responseXML.firstChild.firstChild;
-
-               if (!reply) {
-                       fatalError(3, "Sanity Check: Invalid RPC reply", transport.responseText);
-                       return;
-               }
-
-               var error_code = reply.getAttribute("error-code");
-       
-               if (error_code && error_code != 0) {
-                       return fatalError(error_code, reply.getAttribute("error-msg"));
-               }
-
-               debug("sanity check ok");
-
-               var params = reply.nextSibling;
-
-               if (params) {
-                       debug('reading init-params...');
-                       var param = params.firstChild;
-
-                       while (param) {
-                               var k = param.getAttribute("key");
-                               var v = param.getAttribute("value");
-                               debug(k + " => " + v);
-                               init_params[k] = v;                                     
-                               param = param.nextSibling;
-                       }
-               }
-
-               sanity_check_done = true;
-
-               init_second_stage();
-
-       } catch (e) {
-               exception_error("backend_sanity_check_callback", e);
-       }
-}
-
 function init_second_stage() {
 
        try {
@@ -1241,11 +1152,6 @@ function init() {
 
        try {
        
-               if (getURLParam('debug')) {
-                       Element.show("debug_output");
-                       debug('debug mode activated');
-               }
-
                loading_set_progress(30);
 
                var query = "?op=rpc&subop=sanityCheck";
@@ -1253,7 +1159,7 @@ function init() {
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) { 
-                               backend_sanity_check_callback2(transport);
+                               backend_sanity_check_callback(transport);
                        } });
 
        } catch (e) {
@@ -1269,7 +1175,7 @@ function validatePrefsReset() {
 
                        var query = Form.serialize("pref_prefs_form");
                        query = query + "&subop=reset-config";
-                       debug(query);
+                       console.log(query);
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -1293,41 +1199,6 @@ function validatePrefsReset() {
 
 }
 
-/*function feedBrowserSubscribe() {
-       try {
-
-               var selected = getSelectedFeedsFromBrowser();
-
-               var mode = document.forms['feed_browser'].mode;
-
-               mode = mode[mode.selectedIndex].value;
-
-               if (selected.length > 0) {
-                       closeInfoBox();
-
-                       var query = "?op=pref-feeds&subop=massSubscribe&ids="+
-                               param_escape(selected.toString()) + "&mode=" + param_escape(mode);
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       feedlist_callback2(transport); 
-                               } });
-
-               } else {
-                       alert(__("No feeds are selected."));
-               }
-
-       } catch (e) {
-               exception_error("feedBrowserSubscribe", e);
-       }
-} */
-
-function updateBigFeedBrowserBtn() {
-       notify_progress("Loading, please wait...");
-       return updateBigFeedBrowser();
-}
-
 function selectPrefRows(kind, select) {
 
        if (kind) {
@@ -1370,7 +1241,6 @@ function selectPrefRows(kind, select) {
 
                if (opbarid) {
                        selectTableRowsByIdPrefix(lname, nrow, nchk, select);
-                       disableContainerChildren(opbarid, !select);
                }
 
        } 
@@ -1402,16 +1272,11 @@ function toggleSelectPrefRow(sender, kind) {
                        nsel = getSelectedUsers();
                }
 
-               if (opbarid && nsel != -1) {
-                       disableContainerChildren(opbarid, nsel == false);
-               }
-
        } 
 }
 
 function toggleSelectFBListRow(sender) {
        toggleSelectListRow(sender);
-       disableContainerChildren("fbrOpToolbar", getSelectedFeedsFromBrowser() == 0);
 }
 
 var seq = "";
@@ -1448,7 +1313,7 @@ function pref_hotkey_handler(e) {
                } 
 
                if (!hotkeys_enabled) {
-                       debug("hotkeys disabled");
+                       console.log("hotkeys disabled");
                        return;
                }
 
@@ -1465,7 +1330,7 @@ function pref_hotkey_handler(e) {
                        cmdline.innerHTML = keychar;
                        Element.show(cmdline);
 
-                       debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
+                       console.log("KP: PREFIX=" + keycode + " CHAR=" + keychar);
                        return;
                }
 
@@ -1485,16 +1350,6 @@ function pref_hotkey_handler(e) {
 
                if (!hotkey_prefix) {
 
-                       if (keycode == 68 && shift_key) { // d
-                               if (!Element.visible("debug_output")) {
-                                       Element.show("debug_output");
-                                       debug('debug mode activated');
-                               } else {
-                                       Element.hide("debug_output");
-                               }
-                               return;
-                       }
-       
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
                                        //Element.show("hotkey_help_overlay");
@@ -1512,7 +1367,7 @@ function pref_hotkey_handler(e) {
                                for (var i = 0; i < search_boxes.length; i++) {
                                        var elem = $(search_boxes[i]);
                                        if (elem) {
-                                               focus_element(search_boxes[i]);
+                                               $(search_boxes[i]).focus();
                                                return false;
                                        }
                                }
@@ -1525,20 +1380,15 @@ function pref_hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 70) { // f
-                               displayDlg("quickAddFilter");
+                               quickAddFilter();
                                return false;
                        }
 
                        if (keycode == 83) { // s
-                               displayDlg("quickAddFeed");
+                               quickAddFeed();
                                return false;
                        }
 
-/*                     if (keycode == 76) { // l
-                               displayDlg("quickAddLabel");
-                               return false;
-                       } */
-
                        if (keycode == 85) { // u
                                // no-op
                        }
@@ -1549,7 +1399,7 @@ function pref_hotkey_handler(e) {
                        }
 
                        if (keycode == 84 && shift_key) { // T
-                               browseFeeds();
+                               displayDlg('feedBrowser');
                                return false;
                        }
 
@@ -1593,8 +1443,7 @@ function pref_hotkey_handler(e) {
                }
 
                if ($("piggie")) {
-       
-                       if (seq.match("807371717369")) {
+                       if (seq.match("8073717369")) {
                                seq = "";
                                piggie(true);
                        } else {
@@ -1603,9 +1452,9 @@ function pref_hotkey_handler(e) {
                }
 
                if (hotkey_prefix) {
-                       debug("KP: PREFIX=" + hotkey_prefix + " CODE=" + keycode + " CHAR=" + keychar);
+                       console.log("KP: PREFIX=" + hotkey_prefix + " CODE=" + keycode + " CHAR=" + keychar);
                } else {
-                       debug("KP: CODE=" + keycode + " CHAR=" + keychar);
+                       console.log("KP: CODE=" + keycode + " CHAR=" + keychar);
                }
 
        } catch (e) {
@@ -1617,6 +1466,8 @@ function editFeedCats() {
        try {
                var query = "?op=pref-feeds&subop=editCats";
 
+               notify_progress("Loading, please wait...");
+
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) {
@@ -1718,23 +1569,23 @@ function feedlistToggleSLAT() {
        updateFeedList()
 }
 
-function pubRegenKey() {
+function opmlRegenKey() {
 
        try {
-               var ok = confirm(__("Replace current publishing address with a new one?"));
+               var ok = confirm(__("Replace current OPML publishing address with a new one?"));
        
                if (ok) {
        
                        notify_progress("Trying to change address...", true);
        
-                       var query = "?op=rpc&subop=regenPubKey";
+                       var query = "?op=rpc&subop=regenOPMLKey";
        
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) {
                                                var new_link = transport.responseXML.getElementsByTagName("link")[0];
        
-                                               var e = $('pub_feed_url');
+                                               var e = $('pub_opml_url');
        
                                                if (new_link) {
                                                        e.href = new_link.firstChild.nodeValue;
@@ -1750,11 +1601,10 @@ function pubRegenKey() {
                                } });
                }
        } catch (e) {
-               exception_error("pubRegenKey", e);
+               exception_error("opmlRegenKey", e);
        }
        return false;
 }
-
 function validatePrefsSave() {
        try {
 
@@ -1764,7 +1614,7 @@ function validatePrefsSave() {
 
                        var query = Form.serialize("pref_prefs_form");
                        query = query + "&subop=save-config";
-                       debug(query);
+                       console.log(query);
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -1928,7 +1778,7 @@ function removeFilter(id, title) {
        return false;
 }
 
-function unsubscribeFeed(id, title) {
+/*function unsubscribeFeed(id, title) {
 
        try {
 
@@ -1957,7 +1807,7 @@ function unsubscribeFeed(id, title) {
 
        return false;
 
-}
+} */
 
 function feedsEditSave() {
        try {
@@ -2238,3 +2088,24 @@ function opmlImportHandler(iframe) {
                exception_error("opml_import_handler", e);
        }
 }
+
+function clearFeedAccessKeys() {
+
+       var ok = confirm(__("This will invalidate all previously generated feed URLs. Continue?"));
+
+       if (ok) {
+               notify_progress("Clearing URLs...");
+
+               var query = "?op=rpc&subop=clearKeys";
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                               notify_info("Generated URLs cleared.");
+                       } });
+       }
+       
+       return false;
+}
+
+