]> git.wh0rd.org - tt-rss.git/blobdiff - js/prefs.js
switch modules to new dojo definition format
[tt-rss.git] / js / prefs.js
old mode 100644 (file)
new mode 100755 (executable)
index d1d02af..fdbb51e
@@ -5,62 +5,8 @@ var hotkey_prefix_pressed = false;
 
 var seq = "";
 
-function instancelist_callback2(transport) {
-       try {
-               dijit.byId('instanceConfigTab').attr('content', transport.responseText);
-               selectTab("instanceConfig", true);
-               notify("");
-       } catch (e) {
-               exception_error("instancelist_callback2", e);
-       }
-}
-
-function feedlist_callback2(transport) {
-       try {
-               dijit.byId('feedConfigTab').attr('content', transport.responseText);
-               selectTab("feedConfig", true);
-               notify("");
-       } catch (e) {
-               exception_error("feedlist_callback2", e);
-       }
-}
-
-function filterlist_callback2(transport) {
-       dijit.byId('filterConfigTab').attr('content', transport.responseText);
-       notify("");
-}
-
-function labellist_callback2(transport) {
-       try {
-               dijit.byId('labelConfigTab').attr('content', transport.responseText);
-               notify("");
-       } catch (e) {
-               exception_error("labellist_callback2", e);
-       }
-}
-
-function userlist_callback2(transport) {
-       try {
-               dijit.byId('userConfigTab').attr('content', transport.responseText);
-
-               notify("");
-       } catch (e) {
-               exception_error("userlist_callback2", e);
-       }
-}
-
-function prefslist_callback2(transport) {
-       try {
-               dijit.byId('genConfigTab').attr('content', transport.responseText);
-
-               notify("");
-       } catch (e) {
-               exception_error("prefslist_callback2", e);
-       }
-}
-
-function notify_callback2(transport) {
-       notify_info(transport.responseText);
+function notify_callback2(transport, sticky) {
+       notify_info(transport.responseText, sticky);
 }
 
 function updateFeedList(sort_key) {
@@ -72,22 +18,29 @@ function updateFeedList(sort_key) {
        new Ajax.Request("backend.php", {
                parameters: "?op=pref-feeds&search=" + param_escape(search),
                onComplete: function(transport) {
-                       feedlist_callback2(transport);
+                       dijit.byId('feedConfigTab').attr('content', transport.responseText);
+                       selectTab("feedConfig", true);
+                       notify("");
                } });
 }
 
-function updateInstanceList(sort_key) {
-       new Ajax.Request("backend.php", {
-               parameters: "?op=pref-instances&sort=" + param_escape(sort_key),
-               onComplete: function(transport) {
-                       instancelist_callback2(transport);
-               } });
+function checkInactiveFeeds() {
+       try {
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-feeds&method=getinactivefeeds",
+                       onComplete: function(transport) {
+                               if (parseInt(transport.responseText) > 0) {
+                                       Element.show(dijit.byId("pref_feeds_inactive_btn").domNode);
+                               }
+                       } });
+
+       } catch (e) {
+               exception_error("checkInactiveFeeds", e);
+       }
 }
 
 function updateUsersList(sort_key) {
-
        try {
-
                var user_search = $("user_search");
                var search = "";
                if (user_search) { search = user_search.value; }
@@ -99,7 +52,9 @@ function updateUsersList(sort_key) {
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) {
-                               userlist_callback2(transport);
+                               dijit.byId('userConfigTab').attr('content', transport.responseText);
+                               selectTab("userConfig", true)
+                               notify("");
                        } });
 
        } catch (e) {
@@ -130,7 +85,8 @@ function addUser() {
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) {
-                               userlist_callback2(transport);
+                               notify_callback2(transport);
+                               updateUsersList();
                        } });
 
        } catch (e) {
@@ -141,28 +97,33 @@ function addUser() {
 function editUser(id, event) {
 
        try {
-               if (!event || !event.ctrlKey) {
+               var query = "backend.php?op=pref-users&method=edit&id=" +
+                       param_escape(id);
 
-               notify_progress("Loading, please wait...");
+               if (dijit.byId("userEditDlg"))
+                       dijit.byId("userEditDlg").destroyRecursive();
 
-               selectTableRows('prefUserList', 'none');
-               selectTableRowById('UMRR-'+id, 'UMCHK-'+id, true);
+               dialog = new dijit.Dialog({
+                       id: "userEditDlg",
+                       title: __("User Editor"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+                                       notify_progress("Saving data...", true);
 
-               var query = "?op=pref-users&method=edit&id=" +
-                       param_escape(id);
+                                       var query = dojo.formToQuery("user_edit_form");
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                                       document.forms['user_edit_form'].login.focus();
-                               } });
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       dialog.hide();
+                                                       updateUsersList();
+                                               }});
+                               }
+                       },
+                       href: query});
 
-               } else if (event.ctrlKey) {
-                       var cb = $('UMCHK-' + id);
-                       cb.checked = !cb.checked;
-                       toggleSelectRow(cb);
-               }
+               dialog.show();
 
        } catch (e) {
                exception_error("editUser", e);
@@ -175,6 +136,9 @@ function editFilter(id) {
 
                var query = "backend.php?op=pref-filters&method=edit&id=" + param_escape(id);
 
+               if (dijit.byId("feedEditDlg"))
+                       dijit.byId("feedEditDlg").destroyRecursive();
+
                if (dijit.byId("filterEditDlg"))
                        dijit.byId("filterEditDlg").destroyRecursive();
 
@@ -182,9 +146,44 @@ function editFilter(id) {
                        id: "filterEditDlg",
                        title: __("Edit Filter"),
                        style: "width: 600px",
+
+                       test: function() {
+                               var query = "backend.php?" + dojo.formToQuery("filter_edit_form") + "&savemode=test";
+
+                               editFilterTest(query);
+                       },
+                       selectRules: function(select) {
+                               $$("#filterDlg_Matches input[type=checkbox]").each(function(e) {
+                                       e.checked = select;
+                                       if (select)
+                                               e.parentNode.addClassName("Selected");
+                                       else
+                                               e.parentNode.removeClassName("Selected");
+                               });
+                       },
+                       selectActions: function(select) {
+                               $$("#filterDlg_Actions input[type=checkbox]").each(function(e) {
+                                       e.checked = select;
+
+                                       if (select)
+                                               e.parentNode.addClassName("Selected");
+                                       else
+                                               e.parentNode.removeClassName("Selected");
+
+                               });
+                       },
+                       editRule: function(e) {
+                               var li = e.parentNode;
+                               var rule = li.getElementsByTagName("INPUT")[1].value;
+                               addFilterRule(li, rule);
+                       },
+                       editAction: function(e) {
+                               var li = e.parentNode;
+                               var action = li.getElementsByTagName("INPUT")[1].value;
+                               addFilterAction(li, action);
+                       },
                        removeFilter: function() {
-                               var title = this.attr('value').reg_exp;
-                               var msg = __("Remove filter %s?").replace("%s", title);
+                               var msg = __("Remove filter?");
 
                                if (confirm(msg)) {
                                        this.hide();
@@ -203,57 +202,29 @@ function editFilter(id) {
                                                } });
                                }
                        },
-                       test: function() {
-                               if (this.validate()) {
-
-                                       if (dijit.byId("filterTestDlg"))
-                                               dijit.byId("filterTestDlg").destroyRecursive();
-
-                                       tdialog = new dijit.Dialog({
-                                               id: "filterTestDlg",
-                                               title: __("Filter Test Results"),
-                                               style: "width: 600px",
-                                               href: "backend.php?savemode=test&" +
-                                                       dojo.objectToQuery(dialog.attr('value')),
-                                               });
-
-                                       tdialog.show();
-
-                               }
+                       addAction: function() { addFilterAction(); },
+                       addRule: function() { addFilterRule(); },
+                       deleteAction: function() {
+                               $$("#filterDlg_Actions li.[class*=Selected]").each(function(e) { e.parentNode.removeChild(e) });
+                       },
+                       deleteRule: function() {
+                               $$("#filterDlg_Matches li.[class*=Selected]").each(function(e) { e.parentNode.removeChild(e) });
                        },
                        execute: function() {
                                if (this.validate()) {
 
-                                       var query = "?op=rpc&method=verifyRegexp&reg_exp=" +
-                                               param_escape(dialog.attr('value').reg_exp);
+                                       notify_progress("Saving data...", true);
 
-                                       notify_progress("Verifying regular expression...");
+                                       var query = dojo.formToQuery("filter_edit_form");
 
-                                       new Ajax.Request("backend.php", {
+                                       console.log(query);
+
+                                       new Ajax.Request("backend.php", {
                                                parameters: query,
                                                onComplete: function(transport) {
-                                                       var reply = JSON.parse(transport.responseText);
-
-                                                       if (reply) {
-                                                               notify('');
-
-                                                               if (!reply['status']) {
-                                                                       alert("Match regular expression seems to be invalid.");
-                                                                       return;
-                                                               } else {
-                                                                       notify_progress("Saving data...", true);
-
-                                                                       console.log(dojo.objectToQuery(dialog.attr('value')));
-
-                                                                       new Ajax.Request("backend.php", {
-                                                                               parameters: dojo.objectToQuery(dialog.attr('value')),
-                                                                               onComplete: function(transport) {
-                                                                                       dialog.hide();
-                                                                                       updateFilterList();
-                                                                       }});
-                                                               }
-                                                       }
-                                       }});
+                                                       dialog.hide();
+                                                       updateFilterList();
+                                               }});
                                }
                        },
                        href: query});
@@ -295,6 +266,19 @@ function getSelectedFeeds() {
        return rv;
 }
 
+function getSelectedCategories() {
+       var tree = dijit.byId("feedTree");
+       var items = tree.model.getCheckedItems();
+       var rv = [];
+
+       items.each(function(item) {
+               if (item.id[0].match("CAT:"))
+                       rv.push(tree.model.store.getValue(item, 'bare_id'));
+       });
+
+       return rv;
+}
+
 function getSelectedFilters() {
        var tree = dijit.byId("filterTree");
        var items = tree.model.getCheckedItems();
@@ -308,10 +292,6 @@ function getSelectedFilters() {
 
 }
 
-/* function getSelectedFeedCats() {
-       return getSelectedTableRowIds("prefFeedCatList");
-} */
-
 function removeSelectedLabels() {
 
        var sel_rows = getSelectedLabels();
@@ -329,7 +309,7 @@ function removeSelectedLabels() {
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) {
-                                               labellist_callback2(transport);
+                                               updateLabelList();
                                        } });
 
                }
@@ -359,7 +339,7 @@ function removeSelectedUsers() {
                                new Ajax.Request("backend.php", {
                                        parameters: query,
                                        onComplete: function(transport) {
-                                               userlist_callback2(transport);
+                                               updateUsersList();
                                        } });
 
                        }
@@ -505,43 +485,6 @@ function purgeSelectedFeeds() {
        return false;
 }
 
-function userEditCancel() {
-       closeInfoBox();
-       return false;
-}
-
-function userEditSave() {
-
-       try {
-
-               var login = document.forms["user_edit_form"].login.value;
-
-               if (login.length == 0) {
-                       alert(__("Login field cannot be blank."));
-                       return;
-               }
-
-               notify_progress("Saving user...");
-
-               closeInfoBox();
-
-               var query = Form.serialize("user_edit_form");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               userlist_callback2(transport);
-                       } });
-
-       } catch (e) {
-               exception_error("userEditSave", e);
-       }
-
-       return false;
-
-}
-
-
 function editSelectedUser() {
        var rows = getSelectedUsers();
 
@@ -589,7 +532,7 @@ function resetSelectedUserPass() {
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) {
-                                       userlist_callback2(transport);
+                                       notify_info(transport.responseText, true);
                                } });
 
                }
@@ -615,17 +558,24 @@ function selectedUserDetails() {
                        return;
                }
 
-               notify_progress("Loading, please wait...");
-
                var id = rows[0];
 
-               var query = "?op=pref-users&method=user-details&id=" + id;
+               var query = "backend.php?op=pref-users&method=userdetails&id=" + id;
+
+               if (dijit.byId("userDetailsDlg"))
+                       dijit.byId("userDetailsDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "userDetailsDlg",
+                       title: __("User details"),
+                       style: "width: 600px",
+                       execute: function() {
+                               dialog.hide();
+                       },
+                       href: query});
+
+               dialog.show();
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                               } });
        } catch (e) {
                exception_error("selectedUserDetails", e);
        }
@@ -651,6 +601,31 @@ function editSelectedFilter() {
 
 }
 
+function joinSelectedFilters() {
+       var rows = getSelectedFilters();
+
+       if (rows.length == 0) {
+               alert(__("No filters are selected."));
+               return;
+       }
+
+       var ok = confirm(__("Combine selected filters?"));
+
+       if (ok) {
+               notify_progress("Joining filters...");
+
+               var query = "?op=pref-filters&method=join&ids="+
+                       param_escape(rows.toString());
+
+               console.log(query);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                                       updateFilterList();
+                       } });
+       }
+}
 
 function editSelectedFeed() {
        var rows = getSelectedFeeds();
@@ -727,11 +702,6 @@ function editSelectedFeeds() {
 
                                                        /* Form.serialize ignores unchecked checkboxes */
 
-                                                       if (!query.match("&rtl_content=") &&
-                                                                       this.getChildByName('rtl_content').attr('disabled') == false) {
-                                                               query = query + "&rtl_content=false";
-                                                       }
-
                                                        if (!query.match("&private=") &&
                                                                        this.getChildByName('private').attr('disabled') == false) {
                                                                query = query + "&private=false";
@@ -744,6 +714,13 @@ function editSelectedFeeds() {
                                                                }
                                                        } catch (e) { }
 
+                                                       try {
+                                                               if (!query.match("&hide_images=") &&
+                                                                               this.getChildByName('hide_images').attr('disabled') == false) {
+                                                                       query = query + "&hide_images=false";
+                                                               }
+                                                       } catch (e) { }
+
                                                        if (!query.match("&include_in_digest=") &&
                                                                        this.getChildByName('include_in_digest').attr('disabled') == false) {
                                                                query = query + "&include_in_digest=false";
@@ -759,11 +736,6 @@ function editSelectedFeeds() {
                                                                query = query + "&mark_unread_on_update=false";
                                                        }
 
-                                                       if (!query.match("&update_on_checksum_change=") &&
-                                                                       this.getChildByName('update_on_checksum_change').attr('disabled') == false) {
-                                                               query = query + "&update_on_checksum_change=false";
-                                                       }
-
                                                        console.log(query);
 
                                                        notify_progress("Saving data...", true);
@@ -787,22 +759,12 @@ function editSelectedFeeds() {
        }
 }
 
-function piggie(enable) {
-       if (enable) {
-               console.log("I LOVEDED IT!");
-               var piggie = $("piggie");
-
-               Element.show(piggie);
-               Position.Center(piggie);
-               Effect.Puff(piggie);
-
-       }
-}
-
 function opmlImportComplete(iframe) {
        try {
                if (!iframe.contentDocument.body.innerHTML) return false;
 
+               Element.show(iframe);
+
                notify('');
 
                if (dijit.byId('opmlImportDlg'))
@@ -816,6 +778,14 @@ function opmlImportComplete(iframe) {
                        style: "width: 600px",
                        onCancel: function() {
                                updateFeedList();
+                               updateFilterList();
+                               updateLabelList();
+                       },
+                       execute: function() {
+                               updateFeedList();
+                               updateFilterList();
+                               updateLabelList();
+                               this.hide();
                        },
                        content: content});
 
@@ -835,15 +805,24 @@ function opmlImport() {
                return false;
        } else {
                notify_progress("Importing, please wait...", true);
+
+               Element.show("upload_iframe");
+
                return true;
        }
 }
 
+
 function updateFilterList() {
+       var user_search = $("filter_search");
+       var search = "";
+       if (user_search) { search = user_search.value; }
+
        new Ajax.Request("backend.php", {
-               parameters: "?op=pref-filters",
+               parameters: "?op=pref-filters&search=" + param_escape(search),
                onComplete: function(transport) {
-                       filterlist_callback2(transport);
+                       dijit.byId('filterConfigTab').attr('content', transport.responseText);
+                       notify("");
                } });
 }
 
@@ -851,7 +830,8 @@ function updateLabelList() {
        new Ajax.Request("backend.php", {
                parameters: "?op=pref-labels",
                onComplete: function(transport) {
-                       labellist_callback2(transport);
+                       dijit.byId('labelConfigTab').attr('content', transport.responseText);
+                       notify("");
                } });
 }
 
@@ -859,7 +839,17 @@ function updatePrefsList() {
        new Ajax.Request("backend.php", {
                parameters: "?op=pref-prefs",
                onComplete: function(transport) {
-                       prefslist_callback2(transport);
+                       dijit.byId('genConfigTab').attr('content', transport.responseText);
+                       notify("");
+               } });
+}
+
+function updateSystemList() {
+       new Ajax.Request("backend.php", {
+               parameters: "?op=pref-system",
+               onComplete: function(transport) {
+                       dijit.byId('systemConfigTab').attr('content', transport.responseText);
+                       notify("");
                } });
 }
 
@@ -878,6 +868,8 @@ function selectTab(id, noupdate, method) {
                                updatePrefsList();
                        } else if (id == "userConfig") {
                                updateUsersList();
+                       } else if (id == "systemConfig") {
+                               updateSystemList();
                        }
 
                        var tab = dijit.byId(id + "Tab");
@@ -897,22 +889,20 @@ function init_second_stage() {
                loading_set_progress(50);
                notify("");
 
-               dojo.addOnLoad(function() {
-                       var tab = getURLParam('tab');
+               var tab = getURLParam('tab');
 
-                       if (tab) {
-                               tab = dijit.byId(tab + "Tab");
-                               if (tab) dijit.byId("pref-tabs").selectChild(tab);
-                       }
+               if (tab) {
+                       tab = dijit.byId(tab + "Tab");
+                       if (tab) dijit.byId("pref-tabs").selectChild(tab);
+               }
 
-                       var method = getURLParam('method');
+               var method = getURLParam('method');
 
-                       if (method == 'editFeed') {
-                               var param = getURLParam('methodparam');
+               if (method == 'editFeed') {
+                       var param = getURLParam('methodparam');
 
-                               window.setTimeout('editFeed(' + param + ')', 100);
-                       }
-               });
+                       window.setTimeout('editFeed(' + param + ')', 100);
+               }
 
                setTimeout("hotkey_prefix_timeout()", 5*1000);
 
@@ -924,25 +914,55 @@ function init_second_stage() {
 function init() {
 
        try {
-               dojo.registerModulePath("lib", "..");
-               dojo.registerModulePath("fox", "../../js/");
-
-               dojo.require("lib.CheckBoxTree");
-               dojo.require("fox.PrefFeedTree");
-               dojo.require("fox.PrefFilterTree");
-               dojo.require("fox.PrefLabelTree");
-
-               dojo.parser.parse();
 
-               dojo.addOnLoad(function() {
-                       loading_set_progress(50);
+               require(["dojo/_base/kernel",
+                       "dojo/ready",
+                       "dojo/parser",
+                       "dojo/_base/loader",
+                       "dijit/ColorPalette",
+                       "dijit/Dialog",
+                       "dijit/form/Button",
+                       "dijit/form/CheckBox",
+                       "dijit/form/DropDownButton",
+                       "dijit/form/FilteringSelect",
+                       "dijit/form/Form",
+                       "dijit/form/RadioButton",
+                       "dijit/form/ComboButton",
+                       "dijit/form/Select",
+                       "dijit/form/SimpleTextarea",
+                       "dijit/form/TextBox",
+                       "dijit/form/ValidationTextBox",
+                       "dijit/InlineEditBox",
+                       "dijit/layout/AccordionContainer",
+                       "dijit/layout/AccordionPane",
+                       "dijit/layout/BorderContainer",
+                       "dijit/layout/ContentPane",
+                       "dijit/layout/TabContainer",
+                       "dijit/Menu",
+                       "dijit/ProgressBar",
+                       "dijit/Toolbar",
+                       "dijit/Tree",
+                       "dijit/tree/dndSource",
+                       "dojo/data/ItemFileWriteStore",
+                       "fox/PrefFeedTree",
+                       "fox/PrefFilterTree",
+                       "fox/PrefLabelTree" ], function (dojo, ready, parser) {
+
+                               ready(function() {
+                                       parser.parse();
+
+                                       loading_set_progress(50);
+
+                                       var clientTzOffset = new Date().getTimezoneOffset() * 60;
 
-                       new Ajax.Request("backend.php", {
-                               parameters: {op: "rpc", method: "sanityCheck"},
-                                       onComplete: function(transport) {
-                                       backend_sanity_check_callback(transport);
-                               } });
-               });
+                                       new Ajax.Request("backend.php", {
+                                               parameters: {op: "rpc", method: "sanityCheck",
+                                                       clientTzOffset: clientTzOffset },
+                                               onComplete: function(transport) {
+                                                       backend_sanity_check_callback(transport);
+                                               } });
+                               });
+                       });
 
        } catch (e) {
                exception_error("init", e);
@@ -961,13 +981,8 @@ function validatePrefsReset() {
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) {
-                                       var msg = transport.responseText;
-                                       if (msg.match("PREFS_THEME_CHANGED")) {
-                                               window.location.reload();
-                                       } else {
-                                               notify_info(msg);
-                                               selectTab();
-                                       }
+                                       updatePrefsList();
+                                       notify_info(transport.responseText);
                                } });
 
                }
@@ -980,10 +995,10 @@ function validatePrefsReset() {
 
 }
 
-
 function pref_hotkey_handler(e) {
        try {
-               if (e.target.nodeName == "INPUT") return;
+
+               if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return;
 
                var keycode = false;
                var shift_key = false;
@@ -1005,231 +1020,147 @@ function pref_hotkey_handler(e) {
                var keychar = String.fromCharCode(keycode);
 
                if (keycode == 27) { // escape
-                       if (Element.visible("hotkey_help_overlay")) {
-                               Element.hide("hotkey_help_overlay");
-                       }
                        hotkey_prefix = false;
-                       closeInfoBox();
                }
 
                if (keycode == 16) return; // ignore lone shift
                if (keycode == 17) return; // ignore lone ctrl
 
-               if ((keycode == 67 || keycode == 71) && !hotkey_prefix) {
-                       hotkey_prefix = keycode;
+               if (!shift_key) keychar = keychar.toLowerCase();
+
+               var hotkeys = getInitParam("hotkeys");
+
+               if (!hotkey_prefix && hotkeys[0].indexOf(keychar) != -1) {
 
                        var date = new Date();
                        var ts = Math.round(date.getTime() / 1000);
 
+                       hotkey_prefix = keychar;
                        hotkey_prefix_pressed = ts;
 
                        cmdline.innerHTML = keychar;
                        Element.show(cmdline);
 
-                       console.log("KP: PREFIX=" + keycode + " CHAR=" + keychar);
-                       return;
-               }
-
-               if (Element.visible("hotkey_help_overlay")) {
-                       Element.hide("hotkey_help_overlay");
-               }
-
-               if (keycode == 13 || keycode == 27) {
-                       seq = "";
-               } else {
-                       seq = seq + "" + keycode;
+                       return true;
                }
 
-               /* Global hotkeys */
-
                Element.hide(cmdline);
 
-               if (!hotkey_prefix) {
+               var hotkey = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")";
+               hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey;
+               hotkey_prefix = false;
 
-                       if ((keycode == 191 || keychar == '?') && shift_key) { // ?
-                               if (!Element.visible("hotkey_help_overlay")) {
-                                       //Element.show("hotkey_help_overlay");
-                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3, to: 0.9});
-                               } else {
-                                       Element.hide("hotkey_help_overlay");
-                               }
-                               return false;
-                       }
-
-                       if (keycode == 191 || keychar == '/') { // /
-                               var search_boxes = new Array("label_search",
-                                       "feed_search", "filter_search", "user_search", "feed_browser_search");
+               var hotkey_action = false;
+               var hotkeys = getInitParam("hotkeys");
 
-                               for (var i = 0; i < search_boxes.length; i++) {
-                                       var elem = $(search_boxes[i]);
-                                       if (elem) {
-                                               $(search_boxes[i]).focus();
-                                               return false;
-                                       }
-                               }
+               for (sequence in hotkeys[1]) {
+                       if (sequence == hotkey) {
+                               hotkey_action = hotkeys[1][sequence];
+                               break;
                        }
                }
 
-               /* Prefix c */
+               switch (hotkey_action) {
+               case "feed_subscribe":
+                       quickAddFeed();
+                       return false;
+               case "create_label":
+                       addLabel();
+                       return false;
+               case "create_filter":
+                       quickAddFilter();
+                       return false;
+               case "help_dialog":
+                       //helpDialog("prefs");
+                       return false;
+               default:
+                       console.log("unhandled action: " + hotkey_action + "; hotkey: " + hotkey);
+               }
 
-               if (hotkey_prefix == 67) { // c
-                       hotkey_prefix = false;
+       } catch (e) {
+               exception_error("hotkey_handler", e);
+       }
+}
 
-                       if (keycode == 70) { // f
-                               quickAddFilter();
-                               return false;
-                       }
+function removeCategory(id, item) {
+       try {
 
-                       if (keycode == 83) { // s
-                               quickAddFeed();
-                               return false;
-                       }
+               var ok = confirm(__("Remove category %s? Any nested feeds would be placed into Uncategorized.").replace("%s", item.name));
 
-                       if (keycode == 85) { // u
-                               // no-op
-                       }
+               if (ok) {
+                       var query = "?op=pref-feeds&method=removeCat&ids="+
+                               param_escape(id);
 
-                       if (keycode == 67) { // c
-                               editFeedCats();
-                               return false;
-                       }
+                       notify_progress("Removing category...");
 
-                       if (keycode == 84 && shift_key) { // T
-                               feedBrowser();
-                               return false;
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       notify('');
+                                       updateFeedList();
+                               } });
                        }
 
-               }
-
-               /* Prefix g */
-
-               if (hotkey_prefix == 71) { // g
-
-                       hotkey_prefix = false;
+       } catch (e) {
+               exception_error("removeCategory", e);
+       }
+}
 
-                       if (keycode == 49 && $("genConfigTab")) { // 1
-                               selectTab("genConfig");
-                               return false;
-                       }
+function removeSelectedCategories() {
 
-                       if (keycode == 50 && $("feedConfigTab")) { // 2
-                               selectTab("feedConfig");
-                               return false;
-                       }
+       var sel_rows = getSelectedCategories();
 
-                       if (keycode == 51 && $("filterConfigTab")) { // 4
-                               selectTab("filterConfig");
-                               return false;
-                       }
+       if (sel_rows.length > 0) {
 
-                       if (keycode == 52 && $("labelConfigTab")) { // 5
-                               selectTab("labelConfig");
-                               return false;
-                       }
+               var ok = confirm(__("Remove selected categories?"));
 
-                       if (keycode == 53 && $("userConfigTab")) { // 6
-                               selectTab("userConfig");
-                               return false;
-                       }
-
-                       if (keycode == 88) { // x
-                               return gotoMain();
-                       }
+               if (ok) {
+                       notify_progress("Removing selected categories...");
 
-               }
+                       var query = "?op=pref-feeds&method=removeCat&ids="+
+                               param_escape(sel_rows.toString());
 
-               if ($("piggie")) {
-                       if (seq.match("8073717369")) {
-                               seq = "";
-                               piggie(true);
-                       } else {
-                               piggie(false);
-                       }
-               }
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                               updateFeedList();
+                                       } });
 
-               if (hotkey_prefix) {
-                       console.log("KP: PREFIX=" + hotkey_prefix + " CODE=" + keycode + " CHAR=" + keychar);
-               } else {
-                       console.log("KP: CODE=" + keycode + " CHAR=" + keychar);
                }
-
-       } catch (e) {
-               exception_error("pref_hotkey_handler", e);
+       } else {
+               alert(__("No categories are selected."));
        }
+
+       return false;
 }
 
-function editFeedCats() {
+function createCategory() {
        try {
-               var query = "backend.php?op=pref-feeds&method=editCats";
+               var title = prompt(__("Category title:"));
 
-               if (dijit.byId("feedCatEditDlg"))
-                       dijit.byId("feedCatEditDlg").destroyRecursive();
+               if (title) {
 
-               dialog = new dijit.Dialog({
-                       id: "feedCatEditDlg",
-                       title: __("Feed Categories"),
-                       style: "width: 600px",
-                       getSelectedCategories: function() {
-                               return getSelectedTableRowIds("prefFeedCatList");
-                       },
-                       removeSelected: function() {
-                               var sel_rows = this.getSelectedCategories();
+                       notify_progress("Creating category...");
 
-                               if (sel_rows.length > 0) {
-                                       var ok = confirm(__("Remove selected categories?"));
+                       var query = "?op=pref-feeds&method=addCat&cat=" +
+                               param_escape(title);
 
-                                       if (ok) {
-                                               notify_progress("Removing selected categories...", true);
-
-                                               var query = "?op=pref-feeds&method=editCats&action=remove&ids="+
-                                                       param_escape(sel_rows.toString());
-
-                                               new Ajax.Request("backend.php", {
-                                                       parameters: query,
-                                                       onComplete: function(transport) {
-                                                               notify('');
-                                                               dialog.attr('content', transport.responseText);
-                                                               updateFeedList();
-                                                       } });
-
-                                       }
-
-                               } else {
-                                       alert(__("No categories are selected."));
-                               }
-                       },
-                       addCategory: function() {
-                               if (this.validate()) {
-                                       notify_progress("Creating category...");
-
-                                       var query = "?op=pref-feeds&method=editCats&action=add&cat=" +
-                                               param_escape(this.attr('value').newcat);
-
-                                       new Ajax.Request("backend.php", {
-                                               parameters: query,
-                                               onComplete: function(transport) {
-                                                       notify('');
-                                                       dialog.attr('content', transport.responseText);
-                                                       updateFeedList();
-                                               } });
-                               }
-                       },
-                       execute: function() {
-                               if (this.validate()) {
-                               }
-                       },
-                       href: query});
-
-               dialog.show();
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       notify('');
+                                       updateFeedList();
+                               } });
+               }
 
        } catch (e) {
-               exception_error("editFeedCats", e);
+               exception_error("createCategory", e);
        }
 }
 
 function showInactiveFeeds() {
        try {
-               var query = "backend.php?op=dlg&method=inactiveFeeds";
+               var query = "backend.php?op=pref-feeds&method=inactiveFeeds";
 
                if (dijit.byId("inactiveFeedsDlg"))
                        dijit.byId("inactiveFeedsDlg").destroyRecursive();
@@ -1291,7 +1222,7 @@ function opmlRegenKey() {
 
                        notify_progress("Trying to change address...", true);
 
-                       var query = "?op=rpc&method=regenOPMLKey";
+                       var query = "?op=pref-feeds&method=regenOPMLKey";
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -1440,13 +1371,13 @@ function labelColorReset() {
                        var ok = confirm(__("Reset selected labels to default colors?"));
 
                        if (ok) {
-                               var query = "?op=pref-labels&method=color-reset&ids="+
+                               var query = "?op=pref-labels&method=colorreset&ids="+
                                        param_escape(labels.toString());
 
                                new Ajax.Request("backend.php", {
                                        parameters: query,
                                        onComplete: function(transport) {
-                                               labellist_callback2(transport);
+                                               updateLabelList();
                                        } });
                        }
 
@@ -1470,7 +1401,7 @@ function editProfiles() {
                if (dijit.byId("profileEditDlg"))
                        dijit.byId("profileEditDlg").destroyRecursive();
 
-               var query = "backend.php?op=dlg&method=editPrefProfiles";
+               var query = "backend.php?op=pref-prefs&method=editPrefProfiles";
 
                dialog = new dijit.Dialog({
                        id: "profileEditDlg",
@@ -1591,7 +1522,7 @@ function clearFeedAccessKeys() {
        if (ok) {
                notify_progress("Clearing URLs...");
 
-               var query = "?op=rpc&method=clearKeys";
+               var query = "?op=pref-feeds&method=clearKeys";
 
                new Ajax.Request("backend.php", {
                        parameters: query,
@@ -1603,24 +1534,23 @@ function clearFeedAccessKeys() {
        return false;
 }
 
-function clearArticleAccessKeys() {
-
-       var ok = confirm(__("This will invalidate all previously shared article URLs. Continue?"));
-
-       if (ok) {
-               notify_progress("Clearing URLs...");
-
-               var query = "?op=rpc&method=clearArticleKeys";
+function resetFilterOrder() {
+       try {
+               notify_progress("Loading, please wait...");
 
                new Ajax.Request("backend.php", {
-                       parameters: query,
+                       parameters: "?op=pref-filters&method=filtersortreset",
                        onComplete: function(transport) {
-                               notify_info("Shared URLs cleared.");
+                               updateFilterList();
                        } });
-       }
 
-       return false;
+
+       } catch (e) {
+               exception_error("resetFilterOrder");
+       }
 }
+
+
 function resetFeedOrder() {
        try {
                notify_progress("Loading, please wait...");
@@ -1705,7 +1635,7 @@ function editLabel(id, event) {
                                        color = bg;
                                }
 
-                               var query = "?op=pref-labels&method=color-set&kind="+kind+
+                               var query = "?op=pref-labels&method=colorset&kind="+kind+
                                        "&ids=" + param_escape(id) + "&fg=" + param_escape(fg) +
                                        "&bg=" + param_escape(bg) + "&color=" + param_escape(color);
 
@@ -1749,31 +1679,10 @@ function editLabel(id, event) {
        }
 }
 
-function clearTwitterCredentials() {
-       try {
-               var ok = confirm(__("This will clear your stored authentication information for Twitter. Continue?"));
-
-               if (ok) {
-                       notify_progress("Clearing credentials...");
-
-                       var query = "?op=pref-feeds&method=remtwitterinfo";
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       notify_info("Twitter credentials have been cleared.");
-                                       updateFeedList();
-                               } });
-               }
-
-       } catch (e) {
-               exception_error("clearTwitterCredentials", e);
-       }
-}
 
 function customizeCSS() {
        try {
-               var query = "backend.php?op=dlg&method=customizeCSS";
+               var query = "backend.php?op=pref-prefs&method=customizeCSS";
 
                if (dijit.byId("cssEditDlg"))
                        dijit.byId("cssEditDlg").destroyRecursive();
@@ -1809,159 +1718,94 @@ function insertSSLserial(value) {
        }
 }
 
-function getSelectedInstances() {
-       return getSelectedTableRowIds("prefInstanceList");
+function gotoExportOpml(filename, settings) {
+       tmp = settings ? 1 : 0;
+       document.location.href = "backend.php?op=opml&method=export&filename=" + filename + "&settings=" + tmp;
 }
 
-function addInstance() {
+
+function batchSubscribe() {
        try {
-               var query = "backend.php?op=dlg&method=addInstance";
+               var query = "backend.php?op=pref-feeds&method=batchSubscribe";
 
-               if (dijit.byId("instanceAddDlg"))
-                       dijit.byId("instanceAddDlg").destroyRecursive();
+               // overlapping widgets
+               if (dijit.byId("batchSubDlg")) dijit.byId("batchSubDlg").destroyRecursive();
+               if (dijit.byId("feedAddDlg"))   dijit.byId("feedAddDlg").destroyRecursive();
 
-               dialog = new dijit.Dialog({
-                       id: "instanceAddDlg",
-                       title: __("Link Instance"),
+               var dialog = new dijit.Dialog({
+                       id: "batchSubDlg",
+                       title: __("Batch subscribe"),
                        style: "width: 600px",
-                       regenKey: function() {
-                               new Ajax.Request("backend.php", {
-                                       parameters: "?op=rpc&method=genHash",
-                                       onComplete: function(transport) {
-                                               var reply = JSON.parse(transport.responseText);
-                                               if (reply)
-                                                       dijit.byId('instance_add_key').attr('value', reply.hash);
-
-                                       } });
-                       },
                        execute: function() {
                                if (this.validate()) {
-                                       console.warn(dojo.objectToQuery(this.attr('value')));
+                                       console.log(dojo.objectToQuery(this.attr('value')));
+
+                                       notify_progress(__("Subscribing to feeds..."), true);
 
-                                       notify_progress('Saving data...', true);
                                        new Ajax.Request("backend.php", {
                                                parameters: dojo.objectToQuery(this.attr('value')),
                                                onComplete: function(transport) {
+                                                       notify("");
+                                                       updateFeedList();
                                                        dialog.hide();
-                                                       notify('');
-                                                       updateInstanceList();
-                                       } });
-                               }
+                                               } });
+                                       }
                        },
-                       href: query,
-               });
+                       href: query});
 
                dialog.show();
-
        } catch (e) {
-               exception_error("addInstance", e);
+               exception_error("batchSubscribe", e);
        }
 }
 
-function editInstance(id, event) {
-       try {
-               if (!event || !event.ctrlKey) {
-
-               selectTableRows('prefInstanceList', 'none');
-               selectTableRowById('LIRR-'+id, 'LICHK-'+id, true);
-
-               var query = "backend.php?op=pref-instances&method=edit&id=" +
-                       param_escape(id);
-
-               if (dijit.byId("instanceEditDlg"))
-                       dijit.byId("instanceEditDlg").destroyRecursive();
-
-               dialog = new dijit.Dialog({
-                       id: "instanceEditDlg",
-                       title: __("Edit Instance"),
-                       style: "width: 600px",
-                       regenKey: function() {
-                               new Ajax.Request("backend.php", {
-                                       parameters: "?op=rpc&method=genHash",
-                                       onComplete: function(transport) {
-                                               var reply = JSON.parse(transport.responseText);
-                                               if (reply)
-                                                       dijit.byId('instance_edit_key').attr('value', reply.hash);
-
-                                       } });
-                       },
-                       execute: function() {
-                               if (this.validate()) {
-//                                     console.warn(dojo.objectToQuery(this.attr('value')));
-
-                                       notify_progress('Saving data...', true);
-                                       new Ajax.Request("backend.php", {
-                                               parameters: dojo.objectToQuery(this.attr('value')),
-                                               onComplete: function(transport) {
-                                                       dialog.hide();
-                                                       notify('');
-                                                       updateInstanceList();
-                                       } });
-                               }
-                       },
-                       href: query,
-               });
-
-               dialog.show();
 
-               } else if (event.ctrlKey) {
-                       var cb = $('LICHK-' + id);
-                       cb.checked = !cb.checked;
-                       toggleSelectRow(cb);
-               }
+function toggleAdvancedPrefs() {
+       try {
+               notify_progress("Loading, please wait...");
 
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-prefs&method=toggleadvanced",
+                       onComplete: function(transport) {
+                               updatePrefsList();
+                       } });
 
        } catch (e) {
-               exception_error("editInstance", e);
+               exception_error("toggleAdvancedPrefs", e);
        }
 }
 
-function removeSelectedInstances() {
+function clearPluginData(name) {
        try {
-               var sel_rows = getSelectedInstances();
-
-               if (sel_rows.length > 0) {
-
-                       var ok = confirm(__("Remove selected instances?"));
-
-                       if (ok) {
-                               notify_progress("Removing selected instances...");
-
-                               var query = "?op=pref-instances&method=remove&ids="+
-                                       param_escape(sel_rows.toString());
-
-                               new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) {
-                                               notify('');
-                                               updateInstanceList();
-                                       } });
-                       }
+               if (confirm(__("Clear stored data for this plugin?"))) {
+                       notify_progress("Loading, please wait...");
 
-               } else {
-                       alert(__("No instances are selected."));
+                       new Ajax.Request("backend.php", {
+                               parameters: "?op=pref-prefs&method=clearplugindata&name=" + param_escape(name),
+                               onComplete: function(transport) {
+                                       notify('');
+                                       updatePrefsList();
+                               } });
                }
-
        } catch (e) {
-               exception_error("removeInstance", e);
+               exception_error("clearPluginData", e);
        }
 }
 
-function editSelectedInstance() {
-       var rows = getSelectedInstances();
+function clearSqlLog() {
 
-       if (rows.length == 0) {
-               alert(__("No instances are selected."));
-               return;
-       }
+       if (confirm(__("Clear all messages in the error log?"))) {
 
-       if (rows.length > 1) {
-               alert(__("Please select only one instance."));
-               return;
-       }
+               notify_progress("Loading, please wait...");
+               var query = "?op=pref-system&method=clearLog";
 
-       notify("");
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               updateSystemList();
+                       } });
 
-       editInstance(rows[0]);
+       }
 }
 
+