]> git.wh0rd.org - tt-rss.git/blobdiff - functions.js
rework login process, drop http auth
[tt-rss.git] / functions.js
index 3b6339b82e92fa688e19097cd21234b69122aaae..88d750b6bd46a0ddd50beb475b59ffa21e99fc6f 100644 (file)
@@ -1,5 +1,5 @@
 var hotkeys_enabled = true;
-
+var debug_mode_enabled = false;
 var xmlhttp_rpc = Ajax.getTransport();
 
 function browser_has_opacity() {
@@ -7,7 +7,19 @@ function browser_has_opacity() {
                navigator.userAgent.match("Opera") != null;
 }
 
-function exception_error(location, e) {
+function is_opera() {
+       return navigator.userAgent.match("Opera");
+}
+
+function is_khtml() {
+       return navigator.userAgent.match("KHTML");
+}
+
+function is_safari() {
+       return navigator.userAgent.match("Safari");
+}
+
+function exception_error(location, e, silent) {
        var msg;
 
        if (e.fileName) {
@@ -23,7 +35,9 @@ function exception_error(location, e) {
 
        debug("<b>EXCEPTION: " + msg + "</b>");
 
-       alert(msg);
+       if (!silent) {
+               alert(msg);
+       }
 }
 
 function disableHotkeys() {
@@ -38,6 +52,17 @@ function xmlhttp_ready(obj) {
        return obj.readyState == 4 || obj.readyState == 0 || !obj.readyState;
 }
 
+function logout_callback() {
+       var container = document.getElementById('notify');
+       if (xmlhttp.readyState == 4) {
+               try {
+                       window.location.reload(true);
+               } catch (e) {
+                       exception_error("logout_callback", e);
+               }
+       }
+}
+
 function notify_callback() {
        var container = document.getElementById('notify');
        if (xmlhttp.readyState == 4) {
@@ -78,12 +103,14 @@ function delay(gap) {
 var notify_hide_timerid = false;
 var notify_last_doc = false;
 
-var notify_effect = false;
+var notify_effect = false; 
 
 function hide_notify() {
        if (notify_last_doc) {
                var n = notify_last_doc.getElementById("notify");               
-               if (browser_has_opacity()) {
+               n.style.display = "none";
+
+/*             if (browser_has_opacity()) {
                        if (notify_opacity >= 0) {
                                notify_opacity = notify_opacity - 0.1;
                                n.style.opacity = notify_opacity;
@@ -94,9 +121,9 @@ function hide_notify() {
                        }
                } else {
                        n.style.display = "none";
-               }
+               } */
        }
-}
+} 
 
 function notify_real(msg, doc, no_hide, is_err) {
 
@@ -122,15 +149,19 @@ function notify_real(msg, doc, no_hide, is_err) {
        }
 
        if (is_err) {
-               n.style.backgroundColor = "#ffcccc";
-               n.style.color = "black";
-               n.style.borderColor = "#ff0000";
+               n.className = "notifyError";
+//             n.style.backgroundColor = "#ffcccc";
+//             n.style.color = "black";
+//             n.style.borderColor = "#ff0000";
        } else {
-               n.style.backgroundColor = "#fff7d5";
-               n.style.borderColor = "#d7c47a";
-               n.style.color = "black";
+               n.className = "notify";
+//             n.style.backgroundColor = "#fff7d5";
+//             n.style.borderColor = "#d7c47a";
+//             n.style.color = "black";
        }
 
+//     msg = "<img src='images/live_com_loading.gif'> " + msg;
+
        nb.innerHTML = msg;
 
        if (!no_hide) {
@@ -139,7 +170,7 @@ function notify_real(msg, doc, no_hide, is_err) {
 }
 
 function p_notify(msg, no_hide, is_err) {
-       notify_real(msg, parent.document, no_hide, is_err);
+       notify_real(msg, document, no_hide, is_err);
 }
 
 function notify(msg, no_hide, is_err) {
@@ -149,13 +180,18 @@ function notify(msg, no_hide, is_err) {
 function printLockingError() {
        notify("Please wait until operation finishes");}
 
-var seq = "";
-
 function hotkey_handler(e) {
 
        try {
 
                var keycode;
+               var shift_key = false;
+
+               try {
+                       shift_key = e.shiftKey;
+               } catch (e) {
+
+               }
        
                if (!hotkeys_enabled) return;
        
@@ -164,71 +200,99 @@ function hotkey_handler(e) {
                } else if (e) {
                        keycode = e.which;
                }
-       
-               if (keycode == 13 || keycode == 27) {
-                       seq = "";
-               } else {
-                       seq = seq + "" + keycode;
-               }
-       
-               var m_ctx = getMainContext();
-               var f_ctx = getFeedsContext();
-               var h_ctx = getHeadlinesContext();
-       
+
                if (keycode == 82) { // r
-                       return m_ctx.scheduleFeedUpdate(true);
+                       return scheduleFeedUpdate(true);
                }
-       
+
+               if (keycode == 83) { // s
+                       return displayDlg("search", getActiveFeedId());
+               }
+
                if (keycode == 85) { // u
                        if (getActiveFeedId()) {
-                               return f_ctx.viewfeed(getActiveFeedId(), 0, "ForceUpdate");
+                               return viewfeed(getActiveFeedId(), "ForceUpdate");
                        }
                }
        
                if (keycode == 65) { // a
-                       return m_ctx.toggleDispRead();
+                       return toggleDispRead();
                }
        
-               var f_doc = m_ctx.frames["feeds-frame"].document;
-               var feedlist = f_doc.getElementById('feedList');
+               var feedlist = document.getElementById('feedList');
        
                if (keycode == 74) { // j
                        var feed = getActiveFeedId();
                        var new_feed = getRelativeFeedId(feedlist, feed, 'prev');
-                       if (new_feed) viewfeed(new_feed, 0, '');
+                       if (new_feed) viewfeed(new_feed, '');
                }
        
                if (keycode == 75) { // k
                        var feed = getActiveFeedId();
                        var new_feed = getRelativeFeedId(feedlist, feed, 'next');
-                       if (new_feed) viewfeed(new_feed, 0, '');
+                       if (new_feed) viewfeed(new_feed, '');
                }
 
-               if (keycode == 78 || keycode == 40) { // n, down
-                       return h_ctx.moveToPost('next');
+               if (!is_safari() && (keycode == 78 || keycode == 40)) { // n, down
+                       if (typeof moveToPost != 'undefined') {
+                               return moveToPost('next');
+                       }
                }
        
-               if (keycode == 80 || keycode == 38) { // p, up
-                       return h_ctx.moveToPost('prev');
-               } 
-       
-               if (document.getElementById("piggie")) {
-       
-                       if (seq.match("807371717369")) {
-                               seq = "";
-                               localPiggieFunction(true);
+               if (!is_safari() && (keycode == 80 || keycode == 38)) { // p, up
+                       if (typeof moveToPost != 'undefined') {
+                               return moveToPost('prev');
+                       }
+               }
+               
+               if (keycode == 68 && shift_key) { // d
+                       if (!debug_mode_enabled) {
+                               document.getElementById('debug_output').style.display = 'block';
+                               debug('debug mode activated');
                        } else {
-                               localPiggieFunction(false);
+                               document.getElementById('debug_output').style.display = 'none';
                        }
+
+                       debug_mode_enabled = !debug_mode_enabled;
+               }
+
+               if (keycode == 190 && shift_key) { // >
+                       viewFeedGoPage(1);
                }
                
+               if (keycode == 188 && shift_key) { // <
+                       viewFeedGoPage(-1);
+               }
+
+               if (keycode == 191 && shift_key) { // ?
+                       viewFeedGoPage(0);
+               }
+
+               if (keycode == 69 && shift_key) { // e
+                       return editFeedDlg(getActiveFeedId());
+               }
+
+               if (keycode == 70 && shift_key) { // f
+                       if (getActiveFeedId()) {
+                               return catchupCurrentFeed();
+                       }
+               }
+
+               if (keycode == 80 && shift_key) { // p 
+                       if (getActiveFeedId()) {
+                               return catchupPage();
+                       }
+               }
+
                if (typeof localHotkeyHandler != 'undefined') {
                        try {
-                               localHotkeyHandler(keycode);
+                               return localHotkeyHandler(e);
                        } catch (e) {
                                exception_error("hotkey_handler, local:", e);
                        }
                }
+
+               debug("KP=" + keycode);
        } catch (e) {
                exception_error("hotkey_handler", e);
        }
@@ -250,7 +314,7 @@ function cleanSelectedList(element) {
                for (i = 0; i < content.childNodes.length; i++) {
                        var child = content.childNodes[i];
                        if (child.id == "feedCatHolder") {
-                               parent.debug(child.id);
+                               debug(child.id);
                                var fcat = child.lastChild;
                                for (j = 0; j < fcat.childNodes.length; j++) {
                                        var feed = fcat.childNodes[j];
@@ -449,17 +513,22 @@ function gotoExportOpml() {
 function getActiveFeedId() {
 //     return getCookie("ttrss_vf_actfeed");
        try {
-               debug("gAFID: " + getMainContext().active_feed_id);
-               return getMainContext().active_feed_id;
+               debug("gAFID: " + active_feed_id);
+               return active_feed_id;
        } catch (e) {
                exception_error("getActiveFeedId", e);
        }
 }
 
+function activeFeedIsCat() {
+       return active_feed_is_cat;
+}
+
 function setActiveFeedId(id) {
 //     return setCookie("ttrss_vf_actfeed", id);
        try {
-               getMainContext().active_feed_id = id;
+               debug("sAFID(" + id + ")");
+               active_feed_id = id;
        } catch (e) {
                exception_error("setActiveFeedId", e);
        }
@@ -467,16 +536,14 @@ function setActiveFeedId(id) {
 
 function parse_counters(reply, scheduled_call) {
        try {
-               var f_document = getFeedsContext().document;
-               var title_obj = getMainContext();
+
+               var feeds_found = 0;
 
                if (reply.firstChild && reply.firstChild.firstChild) {
                        debug("<b>wrong element passed to parse_counters, adjusting.</b>");
                        reply = reply.firstChild;
                }
 
-               debug("F_DOC: " + f_document + ", T_OBJ: " + title_obj);
-
                for (var l = 0; l < reply.childNodes.length; l++) {
                        if (!reply.childNodes[l] ||
                                typeof(reply.childNodes[l].getAttribute) == "undefined") {
@@ -492,24 +559,35 @@ function parse_counters(reply, scheduled_call) {
                        var updated = reply.childNodes[l].getAttribute("updated");
        
                        if (id == "global-unread") {
-                               title_obj.global_unread = ctr;
-                               title_obj.updateTitle();
+                               global_unread = ctr;
+                               updateTitle();
+                               continue;
+                       }
+
+                       if (id == "subscribed-feeds") {
+                               feeds_found = ctr;
                                continue;
                        }
        
                        if (t == "category") {
-                               var catctr = f_document.getElementById("FCATCTR-" + id);
+                               var catctr = document.getElementById("FCATCTR-" + id);
                                if (catctr) {
-                                       catctr.innerHTML = "(" + ctr + " unread)";
+                                       catctr.innerHTML = "(" + ctr + ")";
+                                       if (ctr > 0) {
+                                               catctr.className = "catCtrHasUnread";
+                                       } else {
+                                               catctr.className = "catCtrNoUnread";
+                                       }
                                }
                                continue;
                        }
                
-                       var feedctr = f_document.getElementById("FEEDCTR-" + id);
-                       var feedu = f_document.getElementById("FEEDU-" + id);
-                       var feedr = f_document.getElementById("FEEDR-" + id);
-                       var feed_img = f_document.getElementById("FIMG-" + id);
-                       var feedlink = f_document.getElementById("FEEDL-" + id);
+                       var feedctr = document.getElementById("FEEDCTR-" + id);
+                       var feedu = document.getElementById("FEEDU-" + id);
+                       var feedr = document.getElementById("FEEDR-" + id);
+                       var feed_img = document.getElementById("FIMG-" + id);
+                       var feedlink = document.getElementById("FEEDL-" + id);
+                       var feedupd = document.getElementById("FLUPD-" + id);
 
                        if (updated && feedlink) {
                                if (error) {
@@ -519,11 +597,18 @@ function parse_counters(reply, scheduled_call) {
                                }
                        }
 
+                       if (updated && feedupd) {
+                               if (error) {
+                                       feedupd.innerHTML = updated + " (Error)";
+                               } else {
+                                       feedupd.innerHTML = updated;
+                               }
+                       }
+
                        if (feedctr && feedu && feedr) {
 
                                if (feedu.innerHTML != ctr && id == getActiveFeedId() && scheduled_call) {
-                                       var hf = title_obj.parent.frames["headlines-frame"];
-                                       hf.location.reload(true);
+                                       viewCurrentFeed();
                                }
                
                                feedu.innerHTML = ctr;
@@ -555,20 +640,85 @@ function parse_counters(reply, scheduled_call) {
                                }                       
                        }
                }
+
+               hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1);
+
+               var feeds_stored = number_of_feeds;
+
+               debug("Feed counters, C: " + feeds_found + ", S:" + feeds_stored);
+
+               if (feeds_stored != feeds_found) {
+                       number_of_feeds = feeds_found;
+
+                       if (feeds_stored != 0) {
+                               debug("Subscribed feed number changed, refreshing feedlist");
+                               setTimeout('updateFeedList(false, false)', 50);
+                       }
+               }
+
        } catch (e) {
                exception_error("parse_counters", e);
        }
 }
 
+function parse_counters_reply(xmlhttp, scheduled_call) {
+
+       if (!xmlhttp.responseXML) {
+               notify("refetch_callback: backend did not return valid XML", true, true);
+               return;
+       }
+
+       var reply = xmlhttp.responseXML.firstChild;
+       
+       if (!reply) {
+               notify("refetch_callback: backend did not return expected XML object", true, true);
+               updateTitle("");
+               return;
+       } 
+       
+       var error_code = false;
+       var error_msg = false;
+
+       if (reply.firstChild) {
+               error_code = reply.firstChild.getAttribute("error-code");
+               error_msg = reply.firstChild.getAttribute("error-msg");
+       }
+
+       if (!error_code) {      
+               error_code = reply.getAttribute("error-code");
+               error_msg = reply.getAttribute("error-msg");
+       }
+       
+       if (error_code && error_code != 0) {
+               debug("refetch_callback: got error code " + error_code);
+               return fatalError(error_code, error_msg);
+       }
+
+       var counters = reply.firstChild;
+       
+       parse_counters(counters, scheduled_call);
+
+       var runtime_info = counters.nextSibling;
+
+       parse_runtime_info(runtime_info);
+
+       if (getInitParam("feeds_sort_by_unread") == 1) {
+                       resort_feedlist();              
+       }       
+
+       hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1);
+
+}
+
 function all_counters_callback() {
        if (xmlhttp_rpc.readyState == 4) {
                try {
-                       if (!xmlhttp_rpc.responseXML || !xmlhttp_rpc.responseXML.firstChild) {
+/*                     if (!xmlhttp_rpc.responseXML || !xmlhttp_rpc.responseXML.firstChild) {
                                debug("[all_counters_callback] backend did not return valid XML");
                                return;
                        }
 
-                       debug("in all_counters_callback");
+                       debug("in all_counters_callback : " + xmlhttp_rpc.responseXML);
 
                        var reply = xmlhttp_rpc.responseXML.firstChild;
 
@@ -579,15 +729,94 @@ function all_counters_callback() {
                        var runtime = counters.nextSibling;
 
                        if (runtime) {
-                               getMainContext().parse_runtime_info(runtime);
+                               parse_runtime_info(runtime);
                        }
-       
+
+                       if (getInitParam("feeds_sort_by_unread") == 1) {
+                               resort_feedlist();              
+                       }       
+
+                       hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1); */
+                       
+                       debug("in all_counters_callback");
+
+                       parse_counters_reply(xmlhttp_rpc);
+
                } catch (e) {
                        exception_error("all_counters_callback", e);
                }
        }
 }
 
+function get_feed_entry_unread(doc, elem) {
+
+       var id = elem.id.replace("FEEDR-", "");
+
+       if (id <= 0) {
+               return -1;
+       }
+
+       try {
+               return parseInt(doc.getElementById("FEEDU-" + id).innerHTML);   
+       } catch (e) {
+               return -1;
+       }
+}
+
+function resort_category(doc, node) {
+       debug("resort_category: " + node);
+
+       if (node.hasChildNodes() && node.firstChild.nextSibling != false) {  
+               for (i = 0; i < node.childNodes.length; i++) {
+                       if (node.childNodes[i].nodeName != "LI") { continue; }
+
+                       if (get_feed_entry_unread(doc, node.childNodes[i]) < 0) {
+                               continue;
+                       }
+
+                       for (j = i+1; j < node.childNodes.length; j++) {                        
+                               if (node.childNodes[j].nodeName != "LI") { continue; }  
+
+                               var tmp_val = get_feed_entry_unread(doc, node.childNodes[i]);
+                               var cur_val = get_feed_entry_unread(doc, node.childNodes[j]);
+
+                               if (cur_val > tmp_val) {
+                                       tempnode_i = node.childNodes[i].cloneNode(true);
+                                       tempnode_j = node.childNodes[j].cloneNode(true);
+                                       node.replaceChild(tempnode_i, node.childNodes[j]);
+                                       node.replaceChild(tempnode_j, node.childNodes[i]);
+                               }
+                       }
+
+               }
+       }
+
+}
+
+function resort_feedlist() {
+       debug("resort_feedlist");
+
+       var fd = document;
+
+       if (fd.getElementById("feedCatHolder")) {
+
+               var feeds = fd.getElementById("feedList");
+               var child = feeds.firstChild;
+
+               while (child) {
+
+                       if (child.id == "feedCatHolder") {
+                               resort_category(fd, child.firstChild);
+                       }
+       
+                       child = child.nextSibling;
+               }
+
+       } else {
+               resort_category(fd, fd.getElementById("feedList"));
+       }
+}
+
 function update_all_counters(feed) {
        if (xmlhttp_ready(xmlhttp_rpc)) {
                var query = "backend.php?op=rpc&subop=getAllCounters";
@@ -596,6 +825,18 @@ function update_all_counters(feed) {
                        query = query + "&aid=" + feed;
                }
 
+               if (tagsAreDisplayed()) {
+                       query = query + "&omode=lt";
+               } else {
+                       query = query + "&omode=flc";
+               }
+
+               debug("update_all_counters QUERY: " + query);
+
+               var date = new Date();
+               var timestamp = Math.round(date.getTime() / 1000);
+               query = query + "&ts=" + timestamp
+
                xmlhttp_rpc.open("GET", query, true);
                xmlhttp_rpc.onreadystatechange=all_counters_callback;
                xmlhttp_rpc.send(null);
@@ -644,25 +885,88 @@ function popupHelp(tid) {
 
 function hideOrShowFeeds(doc, hide) {
 
-       if (!doc.styleSheets) return;
+       debug("hideOrShowFeeds: " + doc + ", " + hide);
 
-       var css_rules = doc.styleSheets[0].cssRules;
+       var fd = document;
 
-       if (!css_rules || !css_rules.length) return;
+       var list = fd.getElementById("feedList");
 
-       for (i = 0; i < css_rules.length; i++) {
-               var rule = css_rules[i];
+       if (fd.getElementById("feedCatHolder")) {
 
-               if (rule.selectorText == "ul.feedList li.feed") {
-                       if (!hide) {
-                               rule.style.display = "block";
-                       } else {
-                               rule.style.display = "none";
+               var feeds = fd.getElementById("feedList");
+               var child = feeds.firstChild;
+
+               while (child) {
+
+                       if (child.id == "feedCatHolder") {
+                               hideOrShowFeedsCategory(fd, child.firstChild, hide, child.previousSibling);
                        }
+       
+                       child = child.nextSibling;
                }
 
-       } 
+       } else {
+               hideOrShowFeedsCategory(fd, fd.getElementById("feedList"), hide);
+       }
+}
+
+function hideOrShowFeedsCategory(doc, node, hide, cat_node) {
+
+//     debug("hideOrShowFeedsCategory: " + node + " (" + hide + ")");
+
+       var cat_unread = 0;
+
+       if (!node) {
+               debug("hideOrShowFeeds: passed node is null, aborting");
+               return;
+       }
+
+       if (node.hasChildNodes() && node.firstChild.nextSibling != false) {  
+               for (i = 0; i < node.childNodes.length; i++) {
+                       if (node.childNodes[i].nodeName != "LI") { continue; }
 
+                       if (node.childNodes[i].style != undefined) {
+
+                               var has_unread = (node.childNodes[i].className != "feed");
+       
+       //                      debug(node.childNodes[i].id + " --> " + has_unread);
+       
+                               if (hide && !has_unread) {
+                                       node.childNodes[i].style.display = "none";
+                               }
+       
+                               if (!hide) {
+                                       node.childNodes[i].style.display = "list-item";
+                               }
+       
+                               if (has_unread) {
+                                       node.childNodes[i].style.display = "list-item";
+                                       cat_unread++;
+                               }
+                       }
+               }
+       }       
+
+       if (cat_unread == 0) {
+               if (cat_node.style == undefined) {
+                       debug("ERROR: supplied cat_node " + cat_node + 
+                               " has no styles. WTF?");
+                       return;
+               }
+               if (hide) {
+                       cat_node.style.display = "none";
+               } else {
+                       cat_node.style.display = "list-item";
+               }
+       } else {
+               try {
+                       cat_node.style.display = "list-item";
+               } catch (e) {
+                       debug(e);
+               }
+       }
+
+//     debug("unread for category: " + cat_unread);
 }
 
 function selectTableRow(r, do_select) {
@@ -818,7 +1122,7 @@ function getRelativeFeedId(list, id, direction, unread_only) {
                                var child = list.childNodes[i];
                                if (child.id && child.id == "feedCatHolder") {
                                        if (child.lastChild) {
-                                               var cr = getRelativeFeedId(child.firstChild, id, direction);
+                                               var cr = getRelativeFeedId(child.firstChild, id, direction, unread_only);
                                                if (cr) return cr;                                      
                                        }
                                } else if (child.id && child.id.match("FEEDR-")) {
@@ -852,7 +1156,7 @@ function getRelativeFeedId(list, id, direction, unread_only) {
                }
        } else {
        
-               var feed = list.ownerDocument.getElementById("FEEDR-" + getActiveFeedId());
+               var feed = list.ownerDocument.getElementById("FEEDR-" + id);
                
                if (getInitParam("hide_read_feeds") == 1) {
                        unread_only = true;
@@ -888,8 +1192,8 @@ function getRelativeFeedId(list, id, direction, unread_only) {
                           }
 
                                if (e) {
-                                       if (!unread_only || (unread_only && e.className != "feed" && 
-                                                       e.className != "error"))        {
+                                       if (!unread_only || (unread_only && e.className != "feed" &&
+                                                       e.className.match("feed")))     {
                                                return e.id.replace("FEEDR-", "");
                                        }
                                }
@@ -926,7 +1230,7 @@ function getRelativeFeedId(list, id, direction, unread_only) {
 
                                if (e) {
                                        if (!unread_only || (unread_only && e.className != "feed" && 
-                                                       e.className != "error"))        {
+                                                       e.className.match("feed")))     {
                                                return e.id.replace("FEEDR-", "");
                                        }
                                }
@@ -1002,6 +1306,7 @@ function closeInfoBox(cleanup) {
 
        enableHotkeys();
 
+       return false;
 }
 
 
@@ -1021,16 +1326,19 @@ function displayDlg(id, param) {
 
        disableHotkeys();
 
+       return false;
 }
 
 function infobox_submit_callback() {
        if (xmlhttp.readyState == 4) {
                closeInfoBox();
 
-               // called from prefs, reload tab
-               if (active_tab) {
-                       selectTab(active_tab, false);
-               }
+               try {
+                       // called from prefs, reload tab
+                       if (active_tab) {
+                               selectTab(active_tab, false);
+                       }
+               } catch (e) { }
 
                notify(xmlhttp.responseText);
 
@@ -1049,6 +1357,7 @@ function infobox_callback() {
                                box.style.display = "block";                            
                        }
                }
+               notify("");
        }
 }
 
@@ -1059,6 +1368,14 @@ function qaddFilter() {
                return
        }
 
+       var form = document.forms['filter_add_form'];
+       var reg_exp = form.reg_exp.value;
+
+       if (reg_exp == "") {
+               alert("Can't add filter: nothing to match on.");
+               return false;
+       }
+
        var query = Form.serialize("filter_add_form");
 
        xmlhttp.open("GET", "backend.php?" + query, true);
@@ -1087,22 +1404,32 @@ function qafAdd() {
                return
        }
 
-       notify("Adding feed...");
+       var form = document.forms['feed_add_form'];
+       var feed_url = form.feed_url.value;
+
+       if (feed_url == "") {
+               alert("Can't subscribe: no feed URL given.");
+               return false;
+       }
+
+       notify("Adding feed...", true);
 
        closeInfoBox();
 
-       var feeds_doc = getFeedsContext().document;
+       var feeds_doc = document;
 
-       feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait...";
+//     feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait...";
        
        var query = Form.serialize("feed_add_form");
        
        xmlhttp.open("GET", "backend.php?" + query, true);
        xmlhttp.onreadystatechange=dlg_frefresh_callback;
        xmlhttp.send(null);
+
+       return false;
 }
 
-function filterCR(e)
+function filterCR(e, f)
 {
      var key;
 
@@ -1111,50 +1438,55 @@ function filterCR(e)
      else
           key = e.which;     //firefox
 
-     if(key == 13)
-          return false;
-     else
-          return true;
+       if (key == 13) {
+               if (typeof f != 'undefined') {
+                       f();
+                       return false;
+               } else {
+                       return false;
+               }
+       } else {
+               return true;
+       }
 }
 
 function getMainContext() {
-       if (parent.window != window) {
-               return parent.window;
-       } else {
-               return this.window;
-       }
+       return this.window;
 }
 
 function getFeedsContext() {
-       try {
-               return getMainContext().frames["feeds-frame"];
-       } catch (e) {
-               exception_error("getFeedsContext", e);
-       }
+       return this.window;
 }
 
+function getContentContext() {
+       return this.window;
+}
 
 function getHeadlinesContext() {
-       try {
-               return getMainContext().frames["headlines-frame"];
-       } catch (e) {
-               exception_error("getHeadlinesContext", e);
-       }
+       return this.window;
 }
 
+var debug_last_class = "even";
+
 function debug(msg) {
-       var ctx = getMainContext();
 
-       var c = ctx.document.getElementById('debug_output');
+       if (debug_last_class == "even") {
+               debug_last_class = "odd";
+       } else {
+               debug_last_class = "even";
+       }
+
+       var c = document.getElementById('debug_output');
        if (c && c.style.display == "block") {
-               while (c.lastChild != 'undefined' && c.childNodes.length > 20) {
+               while (c.lastChild != 'undefined' && c.childNodes.length > 100) {
                        c.removeChild(c.lastChild);
                }
        
                var d = new Date();
                var ts = leading_zero(d.getHours()) + ":" + leading_zero(d.getMinutes()) +
                        ":" + leading_zero(d.getSeconds());
-               c.innerHTML = "<li>[" + ts + "] " + msg + "</li>" + c.innerHTML;
+               c.innerHTML = "<li class=\"" + debug_last_class + "\"><span class=\"debugTS\">[" + ts + "]</span> " + 
+                       msg + "</li>" + c.innerHTML;
        }
 }
 
@@ -1167,8 +1499,11 @@ function storeInitParam(key, value, is_client) {
                if (!is_client) {
                        if (getMainContext().init_params[key] != value) {
                                debug("storeInitParam: " + key + " => " + value);
-                               new Ajax.Request("backend.php?op=rpc&subop=storeParam&key=" + 
-                                       param_escape(key) + "&value=" + param_escape(value));   
+                               //new Ajax.Request("backend.php?op=rpc&subop=storeParam&key=" + 
+                               //      param_escape(key) + "&value=" + param_escape(value));   
+                               var f = getMainContext().document.getElementById("backReqBox");
+                               f.src = "backend.php?op=rpc&subop=storeParam&key=" + 
+                                       param_escape(key) + "&value=" + param_escape(value);
                        }
                }
                getMainContext().init_params[key] = value;
@@ -1201,24 +1536,97 @@ function storeInitParams(params, is_client) {
 
 function fatalError(code, message) {
        try {   
-               var fe = document.getElementById("fatal_error");
-               var fc = document.getElementById("fatal_error_msg");
-
-               fc.innerHTML = "Code " + code + ": " + message;
 
-               fe.style.display = "block";
+               if (code == 6) {
+                       //window.location.href = "login.php?rt=none";                   
+               } else if (code == 5) {
+                       window.location.href = "update.php";
+               } else {
+                       var fe = document.getElementById("fatal_error");
+                       var fc = document.getElementById("fatal_error_msg");
+       
+                       fc.innerHTML = "Code " + code + ": " + message;
+       
+                       fe.style.display = "block";
+               }
 
        } catch (e) {
                exception_error("fatalError", e);
        }
 }
 
-function getFeedName(id) {
+function getFeedName(id, is_cat) {     
        var d = getFeedsContext().document;
-       var e = d.getElementById("FEEDN-" + id);
+
+       var e;
+
+       if (is_cat) {
+               e = d.getElementById("FCATN-" + id);
+       } else {
+               e = d.getElementById("FEEDN-" + id);
+       }
        if (e) {
                return e.innerHTML.stripTags();
        } else {
                return null;
        }
 }
+
+function viewContentUrl(url) {
+       getContentContext().location = url;
+}
+
+function filterDlgCheckAction(sender) {
+
+       try {
+
+               var action = sender[sender.selectedIndex].value;
+
+               var form = document.forms["filter_add_form"];
+       
+               if (!form) {
+                       form = document.forms["filter_edit_form"];
+               }
+
+               if (!form) {
+                       debug("filterDlgCheckAction: can't find form!");
+                       return;
+               }
+
+               var action_param = form.action_param;
+
+               if (!action_param) {
+                       debug("filterDlgCheckAction: can't find action param!");
+                       return;
+               }
+
+               // if selected action supports parameters, enable params field
+               if (action == 4) {
+                       action_param.disabled = false;
+               } else {
+                       action_param.disabled = true;
+               }
+
+       } catch (e) {
+               exception_error(e, "filterDlgCheckAction");
+       }
+
+}
+
+function explainError(code) {
+       return displayDlg("explainError", code);
+}
+
+function logoutUser() {
+       try {
+               if (xmlhttp_ready(xmlhttp_rpc)) {
+                       xmlhttp_rpc.open("GET", "backend.php?op=rpc&subop=logout", true);
+                       xmlhttp_rpc.onreadystatechange=logout_callback;
+                       xmlhttp_rpc.send(null);
+               } else {
+                       printLockingError();
+               }
+       } catch (e) {
+               exception_error("logoutUser", e);
+       }
+}