]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
daemon2: check proper lockfile location in reap_children()
[tt-rss.git] / prefs.js
index 820c31eacccb56002873155d490f6cb4c4a20851..9fce9059b7ddac005aa471a11dd9ef1d79581211 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,32 +11,8 @@ var color_picker_active = false;
 var selection_disabled = false;
 var mouse_is_down = false;
 
-function replace_pubkey_callback(transport) {
-       try {   
-               var link = $("pubGenAddress");
-
-               if (transport.responseXML) {
-
-                       var new_link = transport.responseXML.getElementsByTagName("link")[0];
-
-                       if (new_link) {
-                               link.href = new_link.firstChild.nodeValue;
-                               //link.innerHTML = new_link.firstChild.nodeValue;
-
-                               new Effect.Highlight(link);
-
-                               notify_info("Published feed URL changed.");
-                       } else {
-                               notify_error("Could not change feed URL.");
-                       }
-
-               } else {
-                       notify_error("Could not change feed URL.");
-               }
-       } catch (e) {
-               exception_error("replace_pubkey_callback", e);
-       }
-}
+var db = false;
+var store = false;
 
 function feedlist_callback2(transport) {
 
@@ -66,12 +41,6 @@ function feedlist_callback2(transport) {
        }
 }
 
-/* stub for subscription dialog */
-
-function dlg_frefresh_callback(transport) {
-       return feedlist_callback2(transport);
-}
-
 function filterlist_callback2(transport) {
        var container = $('prefContent');
        container.innerHTML=transport.responseText;
@@ -154,31 +123,23 @@ function notify_callback2(transport) {
        notify_info(transport.responseText);     
 }
 
-function prefs_reset_callback2(transport) {
+function init_profile_inline_editor() {
        try {
-               notify_info(transport.responseText);
-               selectTab();
-       } catch (e) {
-               exception_error("prefs_reset_callback2", e);
-       }
-}
 
+               if ($("prefFeedCatList")) {
+                       var elems = $("prefFeedCatList").getElementsByTagName("SPAN");
 
-function changepass_callback2(transport) {
-       try {
-       
-                       if (transport.responseText.indexOf("ERROR: ") == 0) {
-                               notify_error(transport.responseText.replace("ERROR: ", ""));
-                       } else {
-                               notify_info(transport.responseText);
-                               var warn = $("default_pass_warning");
-                               if (warn) warn.style.display = "none";
+                       for (var i = 0; i < elems.length; i++) {
+                               if (elems[i].id && elems[i].id.match("FCATT-")) {
+                                       var id = elems[i].id.replace("FCATT-", "");
+                                               new Ajax.InPlaceEditor(elems[i],
+                                               'backend.php?op=rpc&subop=saveprofile&id=' + id);
+                               }
                        }
-       
-                       document.forms['change_pass_form'].reset();
+               }
 
        } catch (e) {
-               exception_error("changepass_callback2", e);
+               exception_error("init_profile_inline_editor", e);
        }
 }
 
@@ -226,12 +187,13 @@ function updateFeedList(sort_key) {
                slat_checked = slat.checked;
        }
 
-       var query = "backend.php?op=pref-feeds" +
+       var query = "?op=pref-feeds" +
                "&sort=" + param_escape(sort_key) + 
                "&slat=" + param_escape(slat_checked) +
                "&search=" + param_escape(search);
 
-       new Ajax.Request(query, {
+       new Ajax.Request("backend.php", {
+               parameters: query,
                onComplete: function(transport) { 
                        feedlist_callback2(transport); 
                } });
@@ -248,11 +210,12 @@ function updateUsersList(sort_key) {
                var search = "";
                if (user_search) { search = user_search.value; }
        
-               var query = "backend.php?op=pref-users&sort="
+               var query = "?op=pref-users&sort="
                        + param_escape(sort_key) +
                        "&search=" + param_escape(search);
        
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
                                userlist_callback2(transport); 
                        } });
@@ -262,37 +225,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 = "backend.php?op=pref-labels&subop=add&caption=" + 
-                       param_escape(caption);
-       
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       infobox_submit_callback2(transport);
-                               } });
-
-       } catch (e) {
-               exception_error("addLabel", e);
-       }
-}
-
 function addFeed() {
 
        try {
@@ -306,10 +238,11 @@ function addFeed() {
                } else {
                        notify_progress("Adding feed...");
        
-                       var query = "backend.php?op=pref-feeds&subop=add&from=tt-rss&feed_url=" +
+                       var query = "?op=pref-feeds&subop=add&from=tt-rss&feed_url=" +
                                param_escape(link.value);
        
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                feedlist_callback2(transport);
                                        } });
@@ -324,6 +257,28 @@ function addFeed() {
 
 }
 
+function addPrefProfile() {
+
+       var profile = $("fadd_profile");
+
+       if (profile.value.length == 0) {
+               alert(__("Can't add profile: no name specified."));
+       } else {
+               notify_progress("Adding profile...");
+
+               var query = "?op=rpc&subop=addprofile&title=" + 
+                       param_escape(profile.value);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                                       editProfiles();
+                               } });
+
+       }
+}
+
+
 function addFeedCat() {
 
        var cat = $("fadd_cat");
@@ -333,10 +288,11 @@ function addFeedCat() {
        } else {
                notify_progress("Adding feed category...");
 
-               var query = "backend.php?op=pref-feeds&subop=editCats&action=add&cat=" +
+               var query = "?op=pref-feeds&subop=editCats&action=add&cat=" +
                        param_escape(cat.value);
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        infobox_feed_cat_callback2(transport);
                                } });
@@ -363,10 +319,11 @@ function addUser() {
        
                notify_progress("Adding user...");
        
-               var query = "backend.php?op=pref-users&subop=add&login=" +
+               var query = "?op=pref-users&subop=add&login=" +
                        param_escape(login);
                                
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
                                userlist_callback2(transport); 
                        } });
@@ -387,12 +344,11 @@ function editUser(id) {
                selectTableRowsByIdPrefix('prefUserList', 'UMRR-', 'UMCHK-', false);
                selectTableRowById('UMRR-'+id, 'UMCHK-'+id, true);
 
-               disableContainerChildren("userOpToolbar", false);
-
-               var query = "backend.php?op=pref-users&subop=edit&id=" +
+               var query = "?op=pref-users&subop=edit&id=" +
                        param_escape(id);
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
                                } });
@@ -411,15 +367,14 @@ function editFilter(id) {
 
                notify_progress("Loading, please wait...");
 
-               disableContainerChildren("filterOpToolbar", false);
-
                selectTableRowsByIdPrefix('prefFilterList', 'FILRR-', 'FICHK-', false);
                selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
 
-               var query = "backend.php?op=pref-filters&subop=edit&id=" + 
+               var query = "?op=pref-filters&subop=edit&id=" + 
                        param_escape(id);
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
                                } });
@@ -440,14 +395,14 @@ function editFeed(feed) {
                selectTableRowsByIdPrefix('prefFeedList', 'FEEDR-', 'FRCHK-', false);
                selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
        
-               disableContainerChildren("feedOpToolbar", false);
-       
-               var query = "backend.php?op=pref-feeds&subop=editfeed&id=" +
+               var query = "?op=pref-feeds&subop=editfeed&id=" +
                        param_escape(feed);
        
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
+                                       document.forms["edit_feed_form"].title.focus();
                                } });
 
        } catch (e) {
@@ -487,10 +442,11 @@ function removeSelectedLabels() {
                if (ok) {
                        notify_progress("Removing selected labels...");
        
-                       var query = "backend.php?op=pref-labels&subop=remove&ids="+
+                       var query = "?op=pref-labels&subop=remove&ids="+
                                param_escape(sel_rows.toString());
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                labellist_callback2(transport);
                                        } });
@@ -511,15 +467,16 @@ 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...");
                
-                               var query = "backend.php?op=pref-users&subop=remove&ids="+
+                               var query = "?op=pref-users&subop=remove&ids="+
                                        param_escape(sel_rows.toString());
        
-                               new Ajax.Request(query, {
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
                                        onComplete: function(transport) { 
                                                userlist_callback2(transport); 
                                        } });
@@ -550,10 +507,11 @@ function removeSelectedFilters() {
                        if (ok) {
                                notify_progress("Removing selected filters...");
                
-                               var query = "backend.php?op=pref-filters&subop=remove&ids="+
+                               var query = "?op=pref-filters&subop=remove&ids="+
                                        param_escape(sel_rows.toString());
        
-                               new Ajax.Request(query, {
+                               new Ajax.Request("backend.php", {
+                                               parameters: query,
                                                onComplete: function(transport) {
                                                                filterlist_callback2(transport);
                                        } });
@@ -583,14 +541,17 @@ function removeSelectedFeeds() {
        
                        if (ok) {
        
-                               notify_progress("Unsubscribing from selected feeds...");
+                               notify_progress("Unsubscribing from selected feeds...", true);
                
-                               var query = "backend.php?op=pref-feeds&subop=remove&ids="+
+                               var query = "?op=pref-feeds&subop=remove&ids="+
                                        param_escape(sel_rows.toString());
-       
-                               new Ajax.Request(query, {
+
+                               console.log(query);
+
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
                                        onComplete: function(transport) {
-                                                       feedlist_callback2(transport);
+                                               updateFeedList();
                                                } });
                        }
        
@@ -643,12 +604,13 @@ function purgeSelectedFeeds() {
                if (pr != undefined) {
                        notify_progress("Purging selected feed...");
 
-                       var query = "backend.php?op=rpc&subop=purge&ids="+
+                       var query = "?op=rpc&subop=purge&ids="+
                                param_escape(sel_rows.toString()) + "&days=" + pr;
 
-                       debug(query);
+                       console.log(query);
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("prefs.php",   {
+                               parameters: query,
                                onComplete: function(transport) {
                                        notify('');
                                } });
@@ -663,6 +625,34 @@ function purgeSelectedFeeds() {
        return false;
 }
 
+function removeSelectedPrefProfiles() {
+
+       var sel_rows = getSelectedFeedCats();
+
+       if (sel_rows.length > 0) {
+
+               var ok = confirm(__("Remove selected profiles? Active and default profiles will not be removed."));
+
+               if (ok) {
+                       notify_progress("Removing selected profiles...");
+       
+                       var query = "?op=rpc&subop=remprofiles&ids="+
+                               param_escape(sel_rows.toString());
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       editProfiles();
+                               } });
+               }
+
+       } else {
+               alert(__("No profiles selected."));
+       }
+
+       return false;
+}
+
 function removeSelectedFeedCats() {
 
        var sel_rows = getSelectedFeedCats();
@@ -674,10 +664,11 @@ function removeSelectedFeedCats() {
                if (ok) {
                        notify_progress("Removing selected categories...");
        
-                       var query = "backend.php?op=pref-feeds&subop=editCats&action=remove&ids="+
+                       var query = "?op=pref-feeds&subop=editCats&action=remove&ids="+
                                param_escape(sel_rows.toString());
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                        infobox_feed_cat_callback2(transport);
                                } });
@@ -695,13 +686,6 @@ function removeSelectedFeedCats() {
 
 function feedEditCancel() {
 
-       try {
-               $("subscribe_to_feed_btn").disabled = false;
-               $("top25_feeds_btn").disabled = false;
-       } catch (e) {
-               // this button is not always available, no-op if not found
-       }
-
        closeInfoBox();
 
        selectPrefRows('feed', false); // cleanup feed selection
@@ -745,7 +729,6 @@ function userEditCancel() {
 function filterEditCancel() {
 
        try {
-               $("create_filter_btn").disabled = false;
                selectPrefRows('filter', false); // cleanup feed selection
        } catch (e) { }
 
@@ -792,13 +775,12 @@ function filterEditSave() {
 
                notify_progress("Saving filter...");
        
-               var query = "backend.php?" + Form.serialize("filter_edit_form");
+               var query = "?" + Form.serialize("filter_edit_form");
        
                closeInfoBox();
-       
-               $("create_filter_btn").disabled = false;
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                filterlist_callback2(transport);
                        } });
@@ -852,10 +834,11 @@ function resetSelectedUserPass() {
                
                        var id = rows[0];
                
-                       var query = "backend.php?op=pref-users&subop=resetPass&id=" +
+                       var query = "?op=pref-users&subop=resetPass&id=" +
                                param_escape(id);
        
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        userlist_callback2(transport); 
                                } });
@@ -887,9 +870,10 @@ function selectedUserDetails() {
        
                var id = rows[0];
        
-               var query = "backend.php?op=pref-users&subop=user-details&id=" + id;
+               var query = "?op=pref-users&subop=user-details&id=" + id;
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
                                } });
@@ -928,8 +912,7 @@ function editSelectedFeed() {
        }
 
        if (rows.length > 1) {
-               alert(__("Please select one feed."));
-               return;
+               return editSelectedFeeds();
        }
 
        notify("");
@@ -954,10 +937,11 @@ function editSelectedFeeds() {
        
                notify_progress("Loading, please wait...");
        
-               var query = "backend.php?op=pref-feeds&subop=editfeeds&ids=" +
+               var query = "?op=pref-feeds&subop=editfeeds&ids=" +
                        param_escape(rows.toString());
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        infobox_callback2(transport);
                                } });
@@ -969,7 +953,7 @@ function editSelectedFeeds() {
 
 function piggie(enable) {
        if (enable) {
-               debug("I LOVEDED IT!");
+               console.log("I LOVEDED IT!");
                var piggie = $("piggie");
 
                Element.show(piggie);
@@ -979,7 +963,7 @@ function piggie(enable) {
        }
 }
 
-function validateOpmlImport() {
+function opmlImport() {
        
        var opml_file = $("opml_file");
 
@@ -989,6 +973,8 @@ function validateOpmlImport() {
        } else {
                return true;
        }
+
+       notify_progress("Importing, please wait...", true);
 }
 
 function updateFilterList(sort_key) {
@@ -998,11 +984,12 @@ function updateFilterList(sort_key) {
                var search = "";
                if (filter_search) { search = filter_search.value; }
        
-               var query = "backend.php?op=pref-filters&sort=" + 
+               var query = "?op=pref-filters&sort=" + 
                        param_escape(sort_key) + 
                        "&search=" + param_escape(search);
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                filterlist_callback2(transport);
                        } });
@@ -1021,11 +1008,12 @@ function updateLabelList(sort_key) {
                var search = "";
                if (label_search) { search = label_search.value; }
        
-               var query = "backend.php?op=pref-labels&sort=" + 
+               var query = "?op=pref-labels&sort=" + 
                        param_escape(sort_key) +
                        "&search=" + param_escape(search);
        
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                labellist_callback2(transport);
                        } });
@@ -1037,9 +1025,10 @@ function updateLabelList(sort_key) {
 
 function updatePrefsList() {
 
-       var query = "backend.php?op=pref-prefs";
+       var query = "?op=pref-prefs";
 
-       new Ajax.Request(query, {
+       new Ajax.Request("backend.php", {
+               parameters: query,
                onComplete: function(transport) { 
                        prefslist_callback2(transport); 
                } });
@@ -1063,7 +1052,7 @@ function selectTab(id, noupdate, subop) {
 
                if (!noupdate) {
 
-                       debug("selectTab: " + id + "(NU: " + noupdate + ")");
+                       console.log("selectTab: " + id + "(NU: " + noupdate + ")");
        
                        notify_progress("Loading, please wait...");
        
@@ -1118,62 +1107,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 {
@@ -1217,21 +1150,19 @@ function init() {
 
        try {
        
-               if (arguments.callee.done) return;
-               arguments.callee.done = true;           
-
                if (getURLParam('debug')) {
                        Element.show("debug_output");
-                       debug('debug mode activated');
+                       console.log('debug mode activated');
                }
 
                loading_set_progress(30);
 
-               var query = "backend.php?op=rpc&subop=sanityCheck";
+               var query = "?op=rpc&subop=sanityCheck";
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
-                               backend_sanity_check_callback2(transport);
+                               backend_sanity_check_callback(transport);
                        } });
 
        } catch (e) {
@@ -1239,33 +1170,6 @@ function init() {
        }
 }
 
-function categorizeSelectedFeeds() {
-
-       var sel_rows = getSelectedFeeds();
-
-       var cat_sel = $("sfeed_set_fcat");
-       var cat_id = cat_sel[cat_sel.selectedIndex].value;
-
-       if (sel_rows.length > 0) {
-
-               notify_progress("Changing category of selected feeds...");
-
-               var query = "backend.php?op=pref-feeds&subop=categorize&ids="+
-                       param_escape(sel_rows.toString()) + "&cat_id=" + param_escape(cat_id);
-
-               new Ajax.Request(query, {
-                       onComplete: function(transport) { 
-                               feedlist_callback2(transport); 
-                       } });
-
-       } else {
-
-               alert(__("No feeds are selected."));
-
-       }
-
-}
-
 function validatePrefsReset() {
        try {
                var ok = confirm(__("Reset to defaults?"));
@@ -1274,54 +1178,30 @@ 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,
                                onComplete: function(transport) { 
-                                       prefs_reset_callback2(transport);
+                                       var msg = transport.responseText;
+                                       if (msg.match("PREFS_THEME_CHANGED")) {
+                                               window.location.reload();
+                                       } else {
+                                               notify_info(msg);
+                                               selectTab();
+                                       }
                                } });
 
                }
 
        } catch (e) {
-               exception_error("validatePrefsSave", e);
+               exception_error("validatePrefsReset", e);
        }
 
        return false;
 
 }
 
-function feedBrowserSubscribe() {
-       try {
-
-               var selected = getSelectedFeedsFromBrowser();
-
-               if (selected.length > 0) {
-                       closeInfoBox();
-
-                       var query = "backend.php?op=pref-feeds&subop=massSubscribe&ids="+
-                               param_escape(selected.toString());
-
-                       new Ajax.Request(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) {
@@ -1355,11 +1235,15 @@ function selectPrefRows(kind, select) {
                        nrow = "UMRR-";
                        nchk = "UMCHK-";
                        lname = "prefUserList";
+               } else if (kind == "fbrowse") {
+                       opbarid = "browseOpToolbar";
+                       nrow = "FBROW-";
+                       nchk = "FBCHK-";
+                       lname = "browseFeedList";
                }
 
                if (opbarid) {
                        selectTableRowsByIdPrefix(lname, nrow, nchk, select);
-                       disableContainerChildren(opbarid, !select);
                }
 
        } 
@@ -1391,16 +1275,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 = "";
@@ -1437,7 +1316,7 @@ function pref_hotkey_handler(e) {
                } 
 
                if (!hotkeys_enabled) {
-                       debug("hotkeys disabled");
+                       console.log("hotkeys disabled");
                        return;
                }
 
@@ -1454,7 +1333,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;
                }
 
@@ -1477,7 +1356,7 @@ function pref_hotkey_handler(e) {
                        if (keycode == 68 && shift_key) { // d
                                if (!Element.visible("debug_output")) {
                                        Element.show("debug_output");
-                                       debug('debug mode activated');
+                                       console.log('debug mode activated');
                                } else {
                                        Element.hide("debug_output");
                                }
@@ -1514,20 +1393,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
                        }
@@ -1538,7 +1412,7 @@ function pref_hotkey_handler(e) {
                        }
 
                        if (keycode == 84 && shift_key) { // T
-                               browseFeeds();
+                               displayDlg('feedBrowser');
                                return false;
                        }
 
@@ -1582,8 +1456,7 @@ function pref_hotkey_handler(e) {
                }
 
                if ($("piggie")) {
-       
-                       if (seq.match("807371717369")) {
+                       if (seq.match("8073717369")) {
                                seq = "";
                                piggie(true);
                        } else {
@@ -1592,9 +1465,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) {
@@ -1604,17 +1477,12 @@ function pref_hotkey_handler(e) {
 
 function editFeedCats() {
        try {
-               $("subscribe_to_feed_btn").disabled = true;
-       
-               try {
-                       $("top25_feeds_btn").disabled = true;
-               } catch (e) {
-                       // this button is not always available, no-op if not found
-               }
-       
-               var query = "backend.php?op=pref-feeds&subop=editCats";
+               var query = "?op=pref-feeds&subop=editCats";
 
-               new Ajax.Request(query, {
+               notify_progress("Loading, please wait...");
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                infobox_feed_cat_callback2(transport);
                        } });
@@ -1663,12 +1531,20 @@ function changeUserPassword() {
 
                var query = Form.serialize("change_pass_form");
        
-               notify_progress("Trying to change password...");
+               notify_progress("Changing password...");
 
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) { 
-                               changepass_callback2(transport); 
+                               if (transport.responseText.indexOf("ERROR: ") == 0) {
+                                       notify_error(transport.responseText.replace("ERROR: ", ""));
+                               } else {
+                                       notify_info(transport.responseText);
+                                       var warn = $("default_pass_warning");
+                                       if (warn) warn.style.display = "none";
+                               }
+               
+                               document.forms['change_pass_form'].reset();
                        } });
 
 
@@ -1708,24 +1584,77 @@ function feedlistToggleSLAT() {
 
 function pubRegenKey() {
 
-       var ok = confirm(__("Replace current publishing address with a new one?"));
+       try {
+               var ok = confirm(__("Replace current publishing address with a new one?"));
+       
+               if (ok) {
+       
+                       notify_progress("Trying to change address...", true);
+       
+                       var query = "?op=rpc&subop=regenPubKey";
+       
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                               var new_link = transport.responseXML.getElementsByTagName("link")[0];
+       
+                                               var e = $('pub_feed_url');
+       
+                                               if (new_link) {
+                                                       e.href = new_link.firstChild.nodeValue;
+                                                       e.innerHTML = new_link.firstChild.nodeValue;
+       
+                                                       new Effect.Highlight(e);
 
-       if (ok) {
+                                                       notify('');
+       
+                                               } else {
+                                                       notify_error("Could not change feed URL.");
+                                               }
+                               } });
+               }
+       } catch (e) {
+               exception_error("pubRegenKey", e);
+       }
+       return false;
+}
 
-               notify_progress("Trying to change address...");
+function opmlRegenKey() {
 
-               var query = "backend.php?op=rpc&subop=regenPubKey";
+       try {
+               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=regenOPMLKey";
+       
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                               var new_link = transport.responseXML.getElementsByTagName("link")[0];
+       
+                                               var e = $('pub_opml_url');
+       
+                                               if (new_link) {
+                                                       e.href = new_link.firstChild.nodeValue;
+                                                       e.innerHTML = new_link.firstChild.nodeValue;
+       
+                                                       new Effect.Highlight(e);
 
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       replace_pubkey_callback(transport);
+                                                       notify('');
+       
+                                               } else {
+                                                       notify_error("Could not change feed URL.");
+                                               }
                                } });
-
+               }
+       } catch (e) {
+               exception_error("opmlRegenKey", e);
        }
-
        return false;
 }
-
 function validatePrefsSave() {
        try {
 
@@ -1735,12 +1664,17 @@ 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,
                                onComplete: function(transport) { 
-                               notify_callback2(transport); 
+                                       var msg = transport.responseText;
+                                       if (msg.match("PREFS_THEME_CHANGED")) {
+                                               window.location.reload();
+                                       } else {
+                                               notify_info(msg);
+                                       }
                        } });
 
                }
@@ -1807,9 +1741,10 @@ function clearFeedArticles(feed_id) {
 
        notify_progress("Clearing feed...");
 
-       var query = "backend.php?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
+       var query = "?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
 
-       new Ajax.Request(query, {
+       new Ajax.Request("backend.php", {
+               parameters: query,
                onComplete: function(transport) {
                                notify('');
                        } });
@@ -1829,10 +1764,11 @@ function rescoreSelectedFeeds() {
                if (ok) {
                        notify_progress("Rescoring selected feeds...", true);
        
-                       var query = "backend.php?op=pref-feeds&subop=rescore&quiet=1&ids="+
+                       var query = "?op=pref-feeds&subop=rescore&quiet=1&ids="+
                                param_escape(sel_rows.toString());
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                notify_callback2(transport);
                        } });
@@ -1851,9 +1787,10 @@ function rescore_all_feeds() {
        if (ok) {
                notify_progress("Rescoring feeds...", true);
 
-               var query = "backend.php?op=pref-feeds&subop=rescoreAll&quiet=1";
+               var query = "?op=pref-feeds&subop=rescoreAll&quiet=1";
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        notify_callback2(transport);
                } });
@@ -1873,10 +1810,11 @@ function removeFilter(id, title) {
        
                        notify_progress("Removing filter...");
                
-                       var query = "backend.php?op=pref-filters&subop=remove&ids="+
+                       var query = "?op=pref-filters&subop=remove&ids="+
                                param_escape(id);
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                filterlist_callback2(transport);
                        } });
@@ -1890,7 +1828,7 @@ function removeFilter(id, title) {
        return false;
 }
 
-function unsubscribeFeed(id, title) {
+/*function unsubscribeFeed(id, title) {
 
        try {
 
@@ -1903,10 +1841,11 @@ function unsubscribeFeed(id, title) {
        
                        notify_progress("Removing feed...");
                
-                       var query = "backend.php?op=pref-feeds&subop=remove&ids="+
+                       var query = "?op=pref-feeds&subop=remove&ids="+
                                param_escape(id);
        
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                                       parameters: query,
                                        onComplete: function(transport) {
                                                        feedlist_callback2(transport);
                                } });
@@ -1918,7 +1857,7 @@ function unsubscribeFeed(id, title) {
 
        return false;
 
-}
+} */
 
 function feedsEditSave() {
        try {
@@ -1933,11 +1872,6 @@ function feedsEditSave() {
 
                        /* Form.serialize ignores unchecked checkboxes */
 
-                       if (!query.match("&hidden=") && 
-                                       f.hidden.disabled == false) {
-                               query = query + "&hidden=false";
-                       }
-
                        if (!query.match("&rtl_content=") && 
                                        f.rtl_content.disabled == false) {
                                query = query + "&rtl_content=false";
@@ -2012,10 +1946,11 @@ function labelColorReset() {
 
                if (ok) {
 
-                       var query = "backend.php?op=pref-labels&subop=color-reset&ids="+
+                       var query = "?op=pref-labels&subop=color-reset&ids="+
                                param_escape(labels.toString());
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) {
                                                labellist_callback2(transport);
                                        } });
@@ -2039,7 +1974,7 @@ function labelColorAsk(id, kind) {
 
                if (p != null) {
 
-                       var query = "backend.php?op=pref-labels&subop=color-set&kind=" + kind +
+                       var query = "?op=pref-labels&subop=color-set&kind=" + kind +
                                "&ids="+        param_escape(id) + "&color=" + param_escape(p);
 
                        selectPrefRows('label', false);
@@ -2054,7 +1989,7 @@ function labelColorAsk(id, kind) {
                                }
                        }
 
-                       new Ajax.Request(query);
+                       new Ajax.Request("backend.php", { parameters: query });
                }
 
        } catch (e) {
@@ -2095,7 +2030,7 @@ function colorPickerHideAll() {
 function colorPickerDo(id, fg, bg) {
        try {
 
-               var query = "backend.php?op=pref-labels&subop=color-set&kind=both"+
+               var query = "?op=pref-labels&subop=color-set&kind=both"+
                        "&ids=" + param_escape(id) + "&fg=" + param_escape(fg) + 
                        "&bg=" + param_escape(bg);
 
@@ -2106,7 +2041,7 @@ function colorPickerDo(id, fg, bg) {
                        e.style.backgroundColor = bg;
                }
 
-               new Ajax.Request(query);
+               new Ajax.Request("backend.php", { parameters: query });
 
        } catch (e) {
                exception_error("colorPickerDo", e);
@@ -2150,3 +2085,56 @@ function mouse_up_handler(e) {
        }
 }
 
+function inPreferences() {
+       return true;
+}
+
+function editProfiles() {
+       displayDlg('editPrefProfiles', false, function() {
+               init_profile_inline_editor();                   
+                       });
+}
+
+function activatePrefProfile() {
+
+       var sel_rows = getSelectedFeedCats();
+
+       if (sel_rows.length == 1) {
+
+               var ok = confirm(__("Activate selected profile?"));
+
+               if (ok) {
+                       notify_progress("Loading, please wait...");
+       
+                       var query = "?op=rpc&subop=setprofile&id="+
+                               param_escape(sel_rows.toString());
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       window.location.reload();
+                               } });
+               }
+
+       } else {
+               alert(__("Please choose a profile to activate."));
+       }
+
+       return false;
+}
+
+function opmlImportDone() {
+       closeInfoBox();
+       updateFeedList();
+}
+
+function opmlImportHandler(iframe) {
+       try {
+               var tmp = new Object();
+               tmp.responseText = iframe.document.body.innerHTML;
+               notify('');
+               infobox_callback2(tmp);
+       } catch (e) {
+               exception_error("opml_import_handler", e);
+       }
+}