]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
viewfeed: return counters when subop is present or when in CDM
[tt-rss.git] / viewfeed.js
index 6afc6c317452acfdcd3c42a134a7f158387ca47b..f46b97863dfd4fb130e1201602b631fae10875c8 100644 (file)
@@ -15,44 +15,16 @@ var post_under_pointer = false;
 
 var last_requested_article = false;
 
-function toggle_published_callback(transport) {
-       try {
-               if (transport.responseXML) {
-
-                       all_counters_callback2(transport);
-
-                       var note = transport.responseXML.getElementsByTagName("note")[0];
+var preload_id_batch = [];
+var preload_timeout_id = false;
 
-                       if (note) {
-                               var note_id = note.getAttribute("id");
-                               var note_size = note.getAttribute("size");
-                               var note_content = note.firstChild.nodeValue;
-
-                               var container = $('POSTNOTE-' + note_id);
-
-                               cache_invalidate(note_id);
-
-                               if (container) {
-                                       if (note_size == "0") {
-                                               Element.hide(container);
-                                       } else {
-                                               container.innerHTML = note_content;
-                                               Element.show(container);
-                                       }
-                               }
-                       }       
-               }
-
-       } catch (e) {
-               exception_error("toggle_published_callback", e, transport);
-       }
-}
+var cache_added = [];
 
 function catchup_callback2(transport, callback) {
        try {
-               debug("catchup_callback2 " + transport + ", " + callback);
+               console.log("catchup_callback2 " + transport + ", " + callback);
                notify("");                     
-               all_counters_callback2(transport);
+               handle_rpc_reply(transport);
                if (callback) {
                        setTimeout(callback, 10);       
                }
@@ -81,14 +53,11 @@ function clean_feed_selections() {
 function headlines_callback2(transport, feed_cur_page) {
        try {
 
-               if (!transport.responseText && db) {
-                       offlineConfirmModeChange();
-                       return;
-               }
+               if (!handle_rpc_reply(transport)) return;
 
                loading_set_progress(100);
 
-               debug("headlines_callback2 [page=" + feed_cur_page + "]");
+               console.log("headlines_callback2 [page=" + feed_cur_page + "]");
 
                if (!transport_error_check(transport)) return;
 
@@ -106,39 +75,57 @@ function headlines_callback2(transport, feed_cur_page) {
                        }
                }
 
+               var ll = $('FLL-' + feed_id);
+
                if (!is_cat) {
                        var feedr = $("FEEDR-" + feed_id);
                        if (feedr && !feedr.className.match("Selected")) {      
                                feedr.className = feedr.className + "Selected";
                        } 
+                       if (feedr && ll) feedr.removeChild(ll);
                } else {
                        var feedr = $("FCAT-" + feed_id);
                        if (feedr && !feedr.className.match("Selected")) {      
                                feedr.className = feedr.className + "Selected";
                        } 
+
+                       var fcap = $("FCAP-" + feed_id);
+                       if (fcap && ll) fcap.removeChild(ll);
+
                }
-       
+
+               var img = $('FIMG-' + feed_id);
+
+               if (img && !is_cat) {
+                       img.src = img.alt;
+               }
+
                var f = $("headlines-frame");
                try {
                        if (feed_cur_page == 0) { 
-                               debug("resetting headlines scrollTop");
+                               //console.log("resetting headlines scrollTop");
                                f.scrollTop = 0; 
                        }
                } catch (e) { };
        
                if (transport.responseXML) {
-                       var headlines = transport.responseXML.getElementsByTagName("headlines")[0];
-                       var headlines_count_obj = transport.responseXML.getElementsByTagName("headlines-count")[0];
-                       var headlines_unread_obj = transport.responseXML.getElementsByTagName("headlines-unread")[0];
-                       var disable_cache_obj = transport.responseXML.getElementsByTagName("disable-cache")[0];
+                       var response = transport.responseXML;
 
-                       var vgroup_last_feed_obj =  transport.responseXML.getElementsByTagName("vgroup-last-feed")[0];
+                       var headlines = response.getElementsByTagName("headlines")[0];
+                       var headlines_info = response.getElementsByTagName("headlines-info")[0];
 
-                       var headlines_count = headlines_count_obj.getAttribute("value");
-                       var headlines_unread = headlines_unread_obj.getAttribute("value");
-                       var disable_cache = disable_cache_obj.getAttribute("value") != "0";
+                       if (headlines_info)
+                               headlines_info = JSON.parse(headlines_info.firstChild.nodeValue);
+                       else {
+                               console.error("didn't find headlines-info object in response");
+                               return;
+                       }
 
-                       vgroup_last_feed = vgroup_last_feed_obj.getAttribute("value");
+                       var headlines_count = headlines_info.count;
+                       var headlines_unread = headlines_info.unread;
+                       var disable_cache = headlines_info.disable_cache;
+                       
+                       vgroup_last_feed = headlines_info.vgroup_last_feed;
 
                        if (headlines_count == 0) {
                                _infscroll_disable = 1;
@@ -146,9 +133,9 @@ function headlines_callback2(transport, feed_cur_page) {
                                _infscroll_disable = 0;
                        }
 
-                       var counters = transport.responseXML.getElementsByTagName("counters")[0];
-                       var articles = transport.responseXML.getElementsByTagName("article");
-                       var runtime_info = transport.responseXML.getElementsByTagName("runtime-info");
+                       var counters = response.getElementsByTagName("counters")[0];
+                       var articles = response.getElementsByTagName("article");
+                       var runtime_info = response.getElementsByTagName("runtime-info");
        
                        if (feed_cur_page == 0) {
                                if (headlines) {
@@ -170,14 +157,14 @@ function headlines_callback2(transport, feed_cur_page) {
                                        }
 
                                } else {
-                                       debug("headlines_callback: returned no data");
+                                       console.warn("headlines_callback: returned no data");
                                f.innerHTML = "<div class='whiteBox'>" + __('Could not update headlines (missing XML data)') + "</div>";
        
                                }
                        } else {
                                if (headlines) {
                                        if (headlines_count > 0) {
-                                               debug("adding some more headlines...");
+                                               console.warn("adding some more headlines...");
        
                                                var c = $("headlinesList");
                
@@ -189,17 +176,17 @@ function headlines_callback2(transport, feed_cur_page) {
        
                                                c.innerHTML = c.innerHTML + headlines.firstChild.nodeValue;
 
-                                               debug("restore selected ids: " + ids);
+                                               console.log("restore selected ids: " + ids);
 
                                                for (var i = 0; i < ids.length; i++) {
                                                        markHeadline(ids[i]);
                                                }
 
                                        } else {
-                                               debug("no new headlines received");
+                                               console.log("no new headlines received");
                                        }
                                } else {
-                                       debug("headlines_callback: returned no data");
+                                       console.warn("headlines_callback: returned no data");
                                        notify_error("Error while trying to load more headlines");      
                                }
 
@@ -208,47 +195,38 @@ function headlines_callback2(transport, feed_cur_page) {
                        if (articles) {
                                for (var i = 0; i < articles.length; i++) {
                                        var a_id = articles[i].getAttribute("id");
-                                       debug("found id: " + a_id);
+                                       //console.log("found id: " + a_id);
                                        cache_inject(a_id, articles[i].firstChild.nodeValue);
                                }
                        } else {
-                               debug("no cached articles received");
+                               console.log("no cached articles received");
                        }
-       
-                       if (counters) {
-                               debug("parsing piggybacked counters: " + counters);
-                               parse_counters(counters, false);
-                       } else {
-                               debug("counters container not found in reply, requesting...");
+
+                       if (counters)
+                               parse_counters(counters);
+                       else
                                request_counters();
-                       }
-       
+
                        if (runtime_info) {
-                               debug("parsing runtime info: " + runtime_info[0]);
                                parse_runtime_info(runtime_info[0]);
-                       } else {
-                               debug("counters container not found in reply");
-                       }
+                       } 
        
                } else {
-                       debug("headlines_callback: returned no XML object");
+                       console.warn("headlines_callback: returned no XML object");
                        f.innerHTML = "<div class='whiteBox'>" + __('Could not update headlines (missing XML object)') + "</div>";
                }
        
-               if (typeof correctPNG != 'undefined') {
-                       correctPNG();
-               }
-       
+
                if (_cdm_wd_timeout) window.clearTimeout(_cdm_wd_timeout);
        
                if (!$("headlinesList") && 
                                getActiveFeedId() != -3 &&
                                getInitParam("cdm_auto_catchup") == 1) {
-                       debug("starting CDM watchdog");
+                       console.log("starting CDM watchdog");
                        _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 5000);
                        _cdm_wd_vishist = new Array();
                } else {
-                       debug("not in CDM mode or watchdog disabled");
+                       console.log("not in CDM mode or watchdog disabled");
                }
        
                _feed_cur_page = feed_cur_page;
@@ -275,8 +253,10 @@ function render_article(article) {
                try {
                        fi.scrollTop = 0;
                } catch (e) { };
-
+               
                fi.innerHTML = article;
+               
+//             article.evalScripts();          
 
        } catch (e) {
                exception_error("render_article", e);
@@ -318,7 +298,9 @@ function showArticleInHeadlines(id) {
                        //
                }
 
-               if (upd_img_pic && upd_img_pic.src.match("updated.png")) {
+               if (upd_img_pic && (upd_img_pic.src.match("updated.png") || 
+                                       upd_img_pic.src.match("fresh_sign.png"))) {
+
                        upd_img_pic.src = "images/blank_icon.gif";
 
                        cache_invalidate(cache_prefix + getActiveFeedId());
@@ -346,43 +328,51 @@ function showArticleInHeadlines(id) {
        }
 }
 
-function article_callback2(transport, id, feed_id) {
+function article_callback2(transport, id) {
        try {
-               debug("article_callback2 " + id);
+               console.log("article_callback2 " + id);
 
-               if (!transport.responseText && db) {
-                       offlineConfirmModeChange();
-                       return;
-               }
+               if (!handle_rpc_reply(transport)) return;
 
                if (transport.responseXML) {
 
                        if (!transport_error_check(transport)) return;
 
-                       debug("looking for articles to cache...");
+/*                     var ll = $('LL-' + id);
+                       var content = $('HLC-' + id);
+
+                       if (ll && content) content.removeChild(ll); */
+                       
+                       var upic = $('FUPDPIC-' + id);
+
+                       if (upic) {
+                               upic.src = 'images/blank_icon.gif';
+                       }
+
+                       if (id != last_requested_article) {
+                               console.log("requested article id is out of sequence, aborting");
+                               return;
+                       }
+
+                       active_post_id = id; 
+
+                       //console.log("looking for articles to cache...");
 
                        var articles = transport.responseXML.getElementsByTagName("article");
 
                        for (var i = 0; i < articles.length; i++) {
                                var a_id = articles[i].getAttribute("id");
 
-                               debug("found id: " + a_id);
+                               //console.log("found id: " + a_id);
 
                                if (a_id == active_post_id) {
-                                       debug("active article, rendering...");                                  
+                                       //console.log("active article, rendering...");                                  
                                        render_article(articles[i].firstChild.nodeValue);
                                }
 
                                cache_inject(a_id, articles[i].firstChild.nodeValue);
                        }
 
-                       if (id != last_requested_article) {
-                               debug("requested article id is out of sequence, aborting");
-                               return;
-                       }
-
-                       active_real_feed_id = feed_id;
-                       active_post_id = id; 
 
                        showArticleInHeadlines(id);     
 
@@ -393,7 +383,7 @@ function article_callback2(transport, id, feed_id) {
                        var reply = transport.responseXML.firstChild.firstChild;
                
                } else {
-                       debug("article_callback: returned no XML object");
+                       console.warn("article_callback: returned no XML object");
                        //var f = $("content-frame");
                        //f.innerHTML = "<div class='whiteBox'>" + __('Could not display article (missing XML object)') + "</div>";
                }
@@ -401,25 +391,11 @@ function article_callback2(transport, id, feed_id) {
                var date = new Date();
                last_article_view = date.getTime() / 1000;
 
-               if (typeof correctPNG != 'undefined') {
-                       correctPNG();
-               }
-
                if (_reload_feedlist_after_view) {
                        setTimeout('updateFeedList(false, false)', 50);                 
                        _reload_feedlist_after_view = false;
                } else {
-                       if (transport.responseXML) {
-                               var counters = transport.responseXML.getElementsByTagName("counters")[0];
-
-                               if (counters) {
-                                       debug("parsing piggybacked counters: " + counters);
-                                       parse_counters(counters, false);
-                               } else {
-                                       debug("counters container not found in reply, requesting...");
-                                       request_counters();
-                               }
-                       }
+                       request_counters();
                }
 
                notify("");
@@ -428,25 +404,20 @@ function article_callback2(transport, id, feed_id) {
        }
 }
 
-function view(id, feed_id, skip_history) {
-       
+function view(id) {
        try {
-               debug("loading article: " + id + "/" + feed_id);
+               console.log("loading article: " + id);
 
-               if (offline_mode) return view_offline(id, feed_id);
+               if (offline_mode) return view_offline(id);
 
                var cached_article = cache_find(id);
 
-               debug("cache check result: " + (cached_article != false));
+               console.log("cache check result: " + (cached_article != false));
        
                enableHotkeys();
-       
-               //setActiveFeedId(feed_id);
-
-               var query = "backend.php?op=view&id=" + param_escape(id) +
-                       "&feed=" + param_escape(feed_id);
+               hideAuxDlg();
 
-               var date = new Date();
+               var query = "?op=view&id=" + param_escape(id);
 
                var neighbor_ids = getRelativePostIds(active_post_id);
 
@@ -460,8 +431,8 @@ function view(id, feed_id, skip_history) {
                        }
                }
 
-               debug("additional ids: " + cids_to_request.toString());                 
-
+               console.log("additional ids: " + cids_to_request.toString());                   
+       
                /* additional info for piggyback counters */
 
                if (tagsAreDisplayed()) {
@@ -470,24 +441,20 @@ function view(id, feed_id, skip_history) {
                        query = query + "&omode=flc";
                }
 
-               var date = new Date();
-               var timestamp = Math.round(date.getTime() / 1000);
-               query = query + "&ts=" + timestamp;
-
                query = query + "&cids=" + cids_to_request.toString();
 
                var crow = $("RROW-" + id);
                var article_is_unread = crow.className.match("Unread");
 
-               if (!async_counters_work) {
-                       query = query + "&csync=true";
-               }
-
                showArticleInHeadlines(id);
 
                if (!cached_article) {
 
-                       notify_progress("Loading, please wait...", true);
+                       var upic = $('FUPDPIC-' + id);
+
+                       if (upic) {     
+                               upic.src = getInitParam("sign_progress");
+                       }
 
                } else if (cached_article && article_is_unread) {
 
@@ -506,9 +473,10 @@ function view(id, feed_id, skip_history) {
 
                last_requested_article = id;
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
-                               article_callback2(transport, id, feed_id); 
+                               article_callback2(transport, id); 
                        } });
 
                return false;
@@ -530,7 +498,7 @@ function tMark_afh_off(effect) {
        try {
                var elem = effect.effects[0].element;
 
-               debug("tMark_afh_off : " + elem.id);
+               //console.log("tMark_afh_off : " + elem.id);
 
                if (elem) {
                        elem.src = elem.src.replace("mark_set", "mark_unset");
@@ -547,7 +515,7 @@ function tPub_afh_off(effect) {
        try {
                var elem = effect.effects[0].element;
 
-               debug("tPub_afh_off : " + elem.id);
+               //console.log("tPub_afh_off : " + elem.id);
 
                if (elem) {
                        elem.src = elem.src.replace("pub_set", "pub_unset");
@@ -564,7 +532,7 @@ function toggleMark(id, client_only, no_effects) {
 
        try {
 
-               var query = "backend.php?op=rpc&id=" + id + "&subop=mark";
+               var query = "?op=rpc&id=" + id + "&subop=mark";
        
                query = query + "&afid=" + getActiveFeedId();
        
@@ -591,7 +559,6 @@ function toggleMark(id, client_only, no_effects) {
                        }
 
                } else {
-                       //mark_img.src = "images/mark_unset.png";
                        mark_img.alt = __("Please wait...");
                        query = query + "&mark=0";
        
@@ -611,11 +578,12 @@ function toggleMark(id, client_only, no_effects) {
                if (!no_effects) update_local_feedlist_counters();
 
                if (!client_only) {
-                       debug(query);
+                       //console.log(query);
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       handle_rpc_reply(transport); 
                                } });
 
                }
@@ -629,7 +597,7 @@ function togglePub(id, client_only, no_effects, note) {
 
        try {
 
-               var query = "backend.php?op=rpc&id=" + id + "&subop=publ";
+               var query = "?op=rpc&id=" + id + "&subop=publ";
        
                query = query + "&afid=" + getActiveFeedId();
 
@@ -658,7 +626,6 @@ function togglePub(id, client_only, no_effects, note) {
                        query = query + "&pub=1";
 
                } else {
-                       //mark_img.src = "images/pub_unset.png";
                        mark_img.alt = __("Please wait...");
                        query = query + "&pub=0";
        
@@ -671,14 +638,36 @@ function togglePub(id, client_only, no_effects, note) {
                }
 
                if (!client_only) {
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
-                                       toggle_published_callback(transport); 
+                                       handle_rpc_reply(transport);
+               
+                                       var note = transport.responseXML.getElementsByTagName("note")[0];
+               
+                                       if (note) {
+                                               var note_id = note.getAttribute("id");
+                                               var note_size = note.getAttribute("size");
+                                               var note_content = note.firstChild.nodeValue;
+               
+                                               var container = $('POSTNOTE-' + note_id);
+               
+                                               cache_invalidate(note_id);
+               
+                                               if (container) {
+                                                       if (note_size == "0") {
+                                                               Element.hide(container);
+                                                       } else {
+                                                               container.innerHTML = note_content;
+                                                               Element.show(container);
+                                                       }
+                                               }
+                                       }       
+
                                } });
                }
 
        } catch (e) {
-
                exception_error("togglePub", e);
        }
 }
@@ -696,8 +685,8 @@ function correctHeadlinesOffset(id) {
                var rel_offset_top = row.offsetTop - container.scrollTop;
                var rel_offset_bottom = row.offsetTop + row.offsetHeight - container.scrollTop;
        
-               debug("Rtop: " + rel_offset_top + " Rbtm: " + rel_offset_bottom);
-               debug("Vport: " + viewport);
+               console.log("Rtop: " + rel_offset_top + " Rbtm: " + rel_offset_bottom);
+               console.log("Vport: " + viewport);
 
                if (rel_offset_top <= 0 || rel_offset_top > viewport) {
                        container.scrollTop = row.offsetTop;
@@ -750,12 +739,8 @@ function moveToPost(mode) {
                        if (next_id) {
                                if (isCdmMode()) {
        
-                                       if (!cdmArticleIsActuallyVisible(next_id)) {
-                                               cdmScrollToArticleId(next_id);
-                                       }
-                                       cdmSelectArticles("none");
-                                       toggleUnread(next_id, 0, true);
-                                       toggleSelected(next_id);
+                                       cdmExpandArticle(next_id);
+                                       cdmScrollToArticleId(next_id);
 
                                } else {
                                        correctHeadlinesOffset(next_id);
@@ -767,10 +752,8 @@ function moveToPost(mode) {
                if (mode == "prev") {
                        if (prev_id) {
                                if (isCdmMode()) {
+                                       cdmExpandArticle(prev_id);
                                        cdmScrollToArticleId(prev_id);
-                                       cdmSelectArticles("none");
-                                       toggleUnread(prev_id, 0, true);
-                                       toggleSelected(prev_id);
                                } else {
                                        correctHeadlinesOffset(prev_id);
                                        view(prev_id, getActiveFeedId());
@@ -896,17 +879,15 @@ function toggleUnread(id, cmode, effect) {
 
                        if (cmode == undefined) cmode = 2;
 
-                       var query = "backend.php?op=rpc&subop=catchupSelected" +
-                               "&cmode=" + param_escape(cmode);
-
-                       var ids = "?ids=" + param_escape(id);
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=" + param_escape(cmode) + "&ids=" + param_escape(id);
 
 //                     notify_progress("Loading, please wait...");
 
-                       new Ajax.Request(query, {
-                               parameters: ids,
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       handle_rpc_reply(transport); 
                                } });
 
                }
@@ -930,17 +911,20 @@ function selectionRemoveLabel(id) {
 
 //             if (ok) {
 
-                       var query = "backend.php?op=rpc&subop=removeFromLabel&ids=" +
+                       var query = "?op=rpc&subop=removeFromLabel&ids=" +
                                param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
+                       console.log(query);
+
 //                     notify_progress("Loading, please wait...");
 
                        cache_invalidate("F:" + (-11 - id));
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        show_labels_in_headlines(transport);
-                                       all_counters_callback2(transport);
+                                       handle_rpc_reply(transport);
                                } });
 
 //             }
@@ -967,15 +951,18 @@ function selectionAssignLabel(id) {
 
                        cache_invalidate("F:" + (-11 - id));
 
-                       var query = "backend.php?op=rpc&subop=assignToLabel&ids=" +
+                       var query = "?op=rpc&subop=assignToLabel&ids=" +
                                param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
+                       console.log(query);
+
 //                     notify_progress("Loading, please wait...");
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        show_labels_in_headlines(transport);
-                                       all_counters_callback2(transport);
+                                       handle_rpc_reply(transport);
                                } });
 
 //             }
@@ -986,15 +973,9 @@ function selectionAssignLabel(id) {
        }
 }
 
-function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
+function selectionToggleUnread(set_state, callback_func, no_error) {
        try {
-               var rows;
-
-               if (cdm_mode) {
-                       rows = cdmGetSelectedArticles();
-               } else {        
-                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-               }
+               var rows = getSelectedArticleIds2();
 
                if (rows.length == 0 && !no_error) {
                        alert(__("No articles are selected."));
@@ -1052,15 +1033,13 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                                cmode = "0";
                        }
 
-                       var query = "backend.php?op=rpc&subop=catchupSelected" +
-                               "&cmode=" + cmode;
-
-                       var ids = "?ids=" + param_escape(rows.toString()); 
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=" + cmode + "&ids=" + param_escape(rows.toString()); 
 
                        notify_progress("Loading, please wait...");
 
-                       new Ajax.Request(query, {
-                               parameters: ids,
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        catchup_callback2(transport, callback_func); 
                                } });
@@ -1072,17 +1051,11 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
        }
 }
 
-function selectionToggleMarked(cdm_mode) {
+function selectionToggleMarked() {
        try {
        
-               var rows;
+               var rows = getSelectedArticleIds2();
                
-               if (cdm_mode) {
-                       rows = cdmGetSelectedArticles();
-               } else {        
-                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-               }       
-
                if (rows.length == 0) {
                        alert(__("No articles are selected."));
                        return;
@@ -1096,22 +1069,17 @@ function selectionToggleMarked(cdm_mode) {
 
                if (rows.length > 0) {
 
-                       var query = "backend.php?op=rpc&subop=markSelected&ids=" +
+                       var query = "?op=rpc&subop=markSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
                        query = query + "&afid=" + getActiveFeedId();
 
-/*                     if (tagsAreDisplayed()) {
-                               query = query + "&omode=tl";
-                       } else {
-                               query = query + "&omode=flc";
-                       } */
-
                        query = query + "&omode=lc";
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       handle_rpc_reply(transport); 
                                } });
 
                }
@@ -1121,16 +1089,10 @@ function selectionToggleMarked(cdm_mode) {
        }
 }
 
-function selectionTogglePublished(cdm_mode) {
+function selectionTogglePublished() {
        try {
        
-               var rows;
-               
-               if (cdm_mode) {
-                       rows = cdmGetSelectedArticles();
-               } else {        
-                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-               }       
+               var rows = getSelectedArticleIds2();
 
                if (rows.length == 0) {
                        alert(__("No articles are selected."));
@@ -1143,22 +1105,17 @@ function selectionTogglePublished(cdm_mode) {
 
                if (rows.length > 0) {
 
-                       var query = "backend.php?op=rpc&subop=publishSelected&ids=" +
+                       var query = "?op=rpc&subop=publishSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
                        query = query + "&afid=" + getActiveFeedId();
 
-/*                     if (tagsAreDisplayed()) {
-                               query = query + "&omode=tl";
-                       } else {
-                               query = query + "&omode=flc";
-                       } */
-
                        query = query + "&omode=lc";
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       handle_rpc_reply(transport); 
                                } });
 
                }
@@ -1263,36 +1220,80 @@ function catchupPage() {
 
        if ($("headlinesList")) {
                selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true);
-               selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
+               selectionToggleUnread(false, 'viewCurrentFeed()', true);
                selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
        } else {
                cdmSelectArticles('all');
-               selectionToggleUnread(true, false, 'viewCurrentFeed()', true)
+               selectionToggleUnread(false, 'viewCurrentFeed()', true)
                cdmSelectArticles('none');
        }
 }
 
-function catchupSelection() {
+function deleteSelection() {
 
        try {
+       
+               var rows = getSelectedArticleIds2();
 
-               var rows;
+               if (rows.length == 0) {
+                       alert(__("No articles are selected."));
+                       return;
+               }
        
-               if ($("headlinesList")) {
-                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-               } else {        
-                       rows = cdmGetSelectedArticles();
+               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+               var str;
+               var op;
+       
+               if (getActiveFeedId() != 0) {
+                       str = __("Delete %d selected articles in %s?");
+               } else {
+                       str = __("Delete %d selected articles?");
                }
        
+               str = str.replace("%d", rows.length);
+               str = str.replace("%s", fn);
+       
+               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+                       return;
+               }
+
+               query = "?op=rpc&subop=delete&ids=" + param_escape(rows);
+
+               console.log(query);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                                       viewCurrentFeed();
+                               } });
+
+       } catch (e) {
+               exception_error("deleteSelection", e);
+       }
+}
+
+function archiveSelection() {
+
+       try {
+
+               var rows = getSelectedArticleIds2();
+
                if (rows.length == 0) {
                        alert(__("No articles are selected."));
                        return;
                }
        
-       
                var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-               
-               var str = __("Mark %d selected articles in %s as read?");
+               var str;
+               var op;
+       
+               if (getActiveFeedId() != 0) {
+                       str = __("Archive %d selected articles in %s?");
+                       op = "archive";
+               } else {
+                       str = __("Move %d archived articles back?");
+                       op = "unarchive";
+               }
        
                str = str.replace("%d", rows.length);
                str = str.replace("%s", fn);
@@ -1300,57 +1301,70 @@ function catchupSelection() {
                if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
                        return;
                }
-       
-               if ($("headlinesList")) {
-                       selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
-       //              selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-               } else {
-                       selectionToggleUnread(true, false, 'viewCurrentFeed()', true)
-       //              cdmSelectArticles('none');
+
+               query = "?op=rpc&subop="+op+"&ids=" + param_escape(rows);
+
+               console.log(query);
+
+               for (var i = 0; i < rows.length; i++) {
+                       cache_invalidate(rows[i]);
                }
 
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                                       viewCurrentFeed();
+                               } });
+
        } catch (e) {
-               exception_error("catchupSelection", e);
+               exception_error("archiveSelection", e);
        }
 }
 
-function editArticleTags(id, feed_id, cdm_enabled) {
-       displayDlg('editArticleTags', id);
-}
-
+function catchupSelection() {
 
-function tag_saved_callback(transport) {
        try {
-               debug("in tag_saved_callback");
 
-               closeInfoBox();
-               notify("");
+               var rows = getSelectedArticleIds2();
 
-               if (tagsAreDisplayed()) {
-                       _reload_feedlist_after_view = true;
+               if (rows.length == 0) {
+                       alert(__("No articles are selected."));
+                       return;
                }
-
-
-               if (transport.responseXML) {
-                       var tags_str = transport.responseXML.getElementsByTagName("tags-str")[0];
-                       
-                       if (tags_str) {
-                               var id = tags_str.getAttribute("id");
-
-                               if (id) {
-                                       var tags = $("ATSTR-" + id);
-                                       if (tags) {
-                                               tags.innerHTML = tags_str.firstChild.nodeValue;
-                                       }
-                               }
-                       }
+       
+               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+               
+               var str = __("Mark %d selected articles in %s as read?");
+       
+               str = str.replace("%d", rows.length);
+               str = str.replace("%s", fn);
+       
+               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+                       return;
+               }
+       
+               if ($("headlinesList")) {
+                       selectionToggleUnread(false, 'viewCurrentFeed()', true);
+               } else {
+                       selectionToggleUnread(false, 'viewCurrentFeed()', true)
                }
 
        } catch (e) {
-               exception_error("tag_saved_callback", e);
+               exception_error("catchupSelection", e);
        }
 }
 
+function editArticleTags(id, feed_id, cdm_enabled) {
+       displayDlg('editArticleTags', id,
+                          function () {
+                                       $("tags_str").focus();
+
+                                       new Ajax.Autocompleter('tags_str', 'tags_choices',
+                                          "backend.php?op=rpc&subop=completeTags",
+                                          { tokens: ',', paramName: "search" });
+                          });
+}
+
 function editTagsSave() {
 
        notify_progress("Saving article tags...");
@@ -1359,15 +1373,44 @@ function editTagsSave() {
 
        var query = Form.serialize("tag_edit_form");
 
-       query = "backend.php?op=rpc&subop=setArticleTags&" + query;
+       query = "?op=rpc&subop=setArticleTags&" + query;
 
-       debug(query);
+       //console.log(query);
 
-       new Ajax.Request(query, {
+       new Ajax.Request("backend.php", {
+               parameters: query,
                onComplete: function(transport) {
-                               tag_saved_callback(transport);
+                               try {
+                                       //console.log("tags saved...");
+                       
+                                       closeInfoBox();
+                                       notify("");
+                       
+                                       if (tagsAreDisplayed()) {
+                                               _reload_feedlist_after_view = true;
+                                       }                       
+                       
+                                       if (transport.responseXML) {
+                                               var tags_str = transport.responseXML.getElementsByTagName("tags-str")[0];
+                                               
+                                               if (tags_str) {
+                                                       var id = tags_str.getAttribute("id");
+                       
+                                                       if (id) {
+                                                               var tags = $("ATSTR-" + id);
+                                                               if (tags) {
+                                                                       tags.innerHTML = tags_str.firstChild.nodeValue;
+                                                               }
+
+                                                               cache_invalidate(id);
+                                                       }
+                                               }
+                                       }
+                       
+                               } catch (e) {
+                                       exception_error("editTagsSave", e);
+                               }
                        } });
-
 }
 
 function editTagsInsert() {
@@ -1396,7 +1439,7 @@ function editTagsInsert() {
 }
 
 function cdmScrollViewport(where) {
-       debug("cdmScrollViewport: " + where);
+       console.log("cdmScrollViewport: " + where);
 
        var ctr = $("headlinesInnerContainer");
 
@@ -1515,7 +1558,7 @@ function cdmWatchdog() {
                                if (ctr.scrollTop <= e.offsetTop && e.offsetTop + e.offsetHeight <=
                                                ctr.scrollTop + ctr.offsetHeight) {
 
-//                                     debug(e.id + " is visible " + e.offsetTop + "." + 
+//                                     console.log(e.id + " is visible " + e.offsetTop + "." + 
 //                                             (e.offsetTop + e.offsetHeight) + " vs " + ctr.scrollTop + "." +
 //                                             (ctr.scrollTop + ctr.offsetHeight));
 
@@ -1543,7 +1586,7 @@ function cdmWatchdog() {
                        e = e.nextSibling;
                }
 
-               debug("cdmWatchdog, ids= " + ids.toString());
+               console.log("cdmWatchdog, ids= " + ids.toString());
 
                if (ids.length > 0) {
 
@@ -1554,15 +1597,13 @@ function cdmWatchdog() {
                                }
                        }
 
-                       var query = "backend.php?op=rpc&subop=catchupSelected" +
-                               "&cmode=0";
-
-                       var ids = "?ids=" + param_escape(ids.toString());
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=0" + "&ids=" + param_escape(ids.toString());
 
-                       new Ajax.Request(query, {
-                               parameters: ids,
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       handle_rpc_reply(transport); 
                                } });
 
                }
@@ -1577,31 +1618,38 @@ function cdmWatchdog() {
 
 
 function cache_inject(id, article, param) {
+
        try {
                if (!cache_check_param(id, param)) {
-                       debug("cache_article: miss: " + id + " [p=" + param + "]");
-       
-       
-                       if (db) {
+                       //console.log("cache_article: miss: " + id + " [p=" + param + "]");
 
-                          var date = new Date();
-                     var ts = Math.round(date.getTime() / 1000);
+                  var date = new Date();
+             var ts = Math.round(date.getTime() / 1000);
+
+                       if (db) {
 
                                db.execute("INSERT INTO cache (id, article, param, added) VALUES (?, ?, ?, ?)",
                                        [id, article, param, ts]);                              
                        } else {
        
-                               var cache_obj = new Array();
+                               var cache_obj = {};
        
                                cache_obj["id"] = id;
                                cache_obj["data"] = article;
                                cache_obj["param"] = param;
-       
-                               article_cache.push(cache_obj);
+
+                               if (param) id = id + ":" + param;
+
+                               cache_added["TS:" + id] = ts;
+
+                               if (has_local_storage()) 
+                                       localStorage.setItem(id, JSON.stringify(cache_obj));
+                               else
+                                       article_cache.push(cache_obj);
                        }
        
                } else {
-                       debug("cache_article: hit: " + id + " [p=" + param + "]");
+                       //console.log("cache_article: hit: " + id + " [p=" + param + "]");
                }
        } catch (e) {   
                exception_error("cache_inject", e);
@@ -1623,9 +1671,22 @@ function cache_find(id) {
                return a;
 
        } else {
-               for (var i = 0; i < article_cache.length; i++) {
-                       if (article_cache[i]["id"] == id) {
-                               return article_cache[i]["data"];
+
+               if (has_local_storage()) {
+                       var cache_obj = localStorage.getItem(id);
+       
+                       if (cache_obj) {
+                               cache_obj = JSON.parse(cache_obj);
+
+                               if (cache_obj)
+                                       return cache_obj['data'];
+                       }
+
+               } else {
+                       for (var i = 0; i < article_cache.length; i++) {
+                               if (article_cache[i]["id"] == id) {
+                                       return article_cache[i]["data"];
+                               }
                        }
                }
        }
@@ -1648,9 +1709,25 @@ function cache_find_param(id, param) {
                return a;
 
        } else {
-               for (var i = 0; i < article_cache.length; i++) {
-                       if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
-                               return article_cache[i]["data"];
+
+               if (has_local_storage()) {
+
+                       if (param) id = id + ":" + param;
+
+                       var cache_obj = localStorage.getItem(id);
+
+                       if (cache_obj) {
+                               cache_obj = JSON.parse(cache_obj);
+
+                               if (cache_obj)
+                                       return cache_obj['data'];
+                       }
+
+               } else {
+                       for (var i = 0; i < article_cache.length; i++) {
+                               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                                       return article_cache[i]["data"];
+                               }
                        }
                }
        }
@@ -1673,9 +1750,14 @@ function cache_check(id) {
                return a;
 
        } else {
-               for (var i = 0; i < article_cache.length; i++) {
-                       if (article_cache[i]["id"] == id) {
+               if (has_local_storage()) {
+                       if (localStorage.getItem(id))
                                return true;
+               } else {
+                       for (var i = 0; i < article_cache.length; i++) {
+                               if (article_cache[i]["id"] == id) {
+                                       return true;
+                               }
                        }
                }
        }
@@ -1698,9 +1780,19 @@ function cache_check_param(id, param) {
                return a;
 
        } else {
-               for (var i = 0; i < article_cache.length; i++) {
-                       if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+
+               if (has_local_storage()) {
+
+                       if (param) id = id + ":" + param;
+
+                       if (localStorage.getItem(id))
                                return true;
+
+               } else {
+                       for (var i = 0; i < article_cache.length; i++) {
+                               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                                       return true;
+                               }
                        }
                }
        }
@@ -1718,14 +1810,36 @@ function cache_expire() {
 
 
        } else {
-               while (article_cache.length > 25) {
-                       article_cache.shift();
+               if (has_local_storage()) {
+
+                       var date = new Date();
+                       var timestamp = Math.round(date.getTime() / 1000);
+
+                       for (var i = 0; i < localStorage.length; i++) {
+
+                               var id = localStorage.key(i);
+
+                               if (timestamp - cache_added["TS:" + id] > 180) {
+                                       localStorage.removeItem(id);
+                               }
+                       }
+
+               } else {
+                       while (article_cache.length > 25) {
+                               article_cache.shift();
+                       }
                }
        }
 }
 
-function cache_empty() {
-       article_cache = new Array();
+function cache_flush() {
+       if (db) {
+               db.execute("DELETE FROM cache");
+       } else if (has_local_storage()) {
+               localStorage.clear();
+       } else {
+               article_cache = new Array();
+       }
 }
 
 function cache_invalidate(id) {
@@ -1736,19 +1850,39 @@ function cache_invalidate(id) {
                        return rs.rowsAffected != 0;
                } else {
 
-                       var i = 0
+                       if (has_local_storage()) {
 
-                       while (i < article_cache.length) {
-                               if (article_cache[i]["id"] == id) {
-                                       debug("cache_invalidate: removed id " + id);
-                                       article_cache.splice(i, 1);
-                                       return true;
+                               var found = false;
+
+                               for (var i = 0; i < localStorage.length; i++) {
+                                       var key = localStorage.key(i);
+
+//                                     console.warn("cache_invalidate: " + key_id + " cmp " + id);
+
+                                       if (key == id || key.indexOf(id + ":") == 0) {
+                                               localStorage.removeItem(key);
+                                               found = true;
+                                               break;
+                                       }
+                               }
+
+                               return found;
+
+                       } else {
+                               var i = 0
+
+                               while (i < article_cache.length) {
+                                       if (article_cache[i]["id"] == id) {
+                                               //console.log("cache_invalidate: removed id " + id);
+                                               article_cache.splice(i, 1);
+                                               return true;
+                                       }
+                                       i++;
                                }
-                               i++;
                        }
                }
 
-               debug("cache_invalidate: id not found: " + id);
+               //console.log("cache_invalidate: id not found: " + id);
                return false;
        } catch (e) {
                exception_error("cache_invalidate", e);
@@ -1759,39 +1893,31 @@ function getActiveArticleId() {
        return active_post_id;
 }
 
-function cdmClicked(id) {
+function preloadBatchedArticles() {
        try {
-               var elem = $("RROW-" + id);
 
-               if (elem) {
-                       var id = elem.id.replace("RROW-", "");
-                       active_post_id = id;
+               var query = "?op=rpc&subop=getArticles&ids=" + 
+                       preload_id_batch.toString();
 
-//                     cdmSelectArticles("none");
-                       toggleUnread(id, 0, true);
-//                     toggleSelected(id);
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
 
-               }
-       } catch (e) {
-               exception_error("cdmClicked", e);
-       } 
-}
+                               preload_id_batch = [];
 
-function preload_article_callback(transport) {
-       try {
-               if (transport.responseXML) {
-                       var articles = transport.responseXML.getElementsByTagName("article");
+                               var articles = transport.responseXML.getElementsByTagName("article");
 
-                       for (var i = 0; i < articles.length; i++) {
-                               var id = articles[i].getAttribute("id");
-                               if (!cache_check(id)) {
-                                       cache_inject(id, articles[i].firstChild.nodeValue);                             
-                                       debug("preloaded article: " + id);
+                               for (var i = 0; i < articles.length; i++) {
+                                       var id = articles[i].getAttribute("id");
+                                       if (!cache_check(id)) {
+                                               cache_inject(id, articles[i].firstChild.nodeValue);                             
+                                               console.log("preloaded article: " + id);
+                                       }
                                }
-                       }
-               }
+               } }); 
+
        } catch (e) {
-               exception_error("preload_article_callback", e);
+               exception_error("preloadBatchedArticles", e);
        }
 }
 
@@ -1801,29 +1927,28 @@ function preloadArticleUnderPointer(id) {
 
                if (post_under_pointer == id && !cache_check(id)) {
 
-                       debug("trying to preload article " + id);
+                       console.log("trying to preload article " + id);
 
                        var neighbor_ids = getRelativePostIds(id, 1);
 
                        /* only request uncached articles */
 
-                       var cids_to_request = Array();
-
-                       for (var i = 0; i < neighbor_ids.length; i++) {
-                               if (!cache_check(neighbor_ids[i])) {
-                                       cids_to_request.push(neighbor_ids[i]);
+                       if (preload_id_batch.indexOf(id) == -1) {
+                               for (var i = 0; i < neighbor_ids.length; i++) {
+                                       if (!cache_check(neighbor_ids[i])) {
+                                               preload_id_batch.push(neighbor_ids[i]);
+                                       }
                                }
                        }
-                       debug("additional ids: " + cids_to_request.toString());
 
-                       cids_to_request.push(id);
+                       if (preload_id_batch.indexOf(id) == -1)
+                               preload_id_batch.push(id);
+
+                       //console.log("preload ids batch: " + preload_id_batch.toString());
+
+                       window.clearTimeout(preload_timeout_id);
+                       preload_batch_timeout_id = window.setTimeout('preloadBatchedArticles()', 1000);
 
-                       var query = "backend.php?op=rpc&subop=getArticles&ids=" + 
-                               cids_to_request.toString();
-                       new Ajax.Request(query, {
-                               onComplete: function(transport) { 
-                                       preload_article_callback(transport);
-                       } });
                }
        } catch (e) {
                exception_error("preloadArticleUnderPointer", e);
@@ -1857,21 +1982,14 @@ function headlines_scroll_handler() {
 
                var e = $("headlinesInnerContainer");
 
-               // don't do infinite scrolling when Limit == All
-
                var toolbar_form = document.forms["main_toolbar_form"];
 
-               var limit = toolbar_form.limit[toolbar_form.limit.selectedIndex];
-               if (limit.value != 0) {
-               
-                       debug((e.scrollTop + e.offsetHeight) + " vs " + e.scrollHeight + " dis? " +
-                               _infscroll_disable);
+//             console.log((e.scrollTop + e.offsetHeight) + " vs " + e.scrollHeight + " dis? " +
+//                     _infscroll_disable);
 
-                       if (e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
-                               if (!_infscroll_disable) {
-                                       debug("more cowbell!");
-                                       viewNextFeedPage();
-                               }
+               if (e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
+                       if (!_infscroll_disable) {
+                               viewNextFeedPage();
                        }
                }
 
@@ -1931,20 +2049,18 @@ function catchupRelativeToArticle(below) {
                } else {
                        var msg = __("Mark %d article(s) as read?").replace("%d", ids_to_mark.length);
 
-                       if (confirm(msg)) {
+                       if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
 
                                for (var i = 0; i < ids_to_mark.length; i++) {
                                        var e = $("RROW-" + ids_to_mark[i]);
                                        e.className = e.className.replace("Unread", "");
                                }
 
-                               var query = "backend.php?op=rpc&subop=catchupSelected" +
-                                       "&cmode=0";
-
-                               var ids = "?ids=" + param_escape(ids_to_mark.toString()); 
+                               var query = "?op=rpc&subop=catchupSelected" +
+                                       "&cmode=0" + "&ids=" + param_escape(ids_to_mark.toString()); 
 
-                               new Ajax.Request(query, {
-                                       parameters: ids,
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
                                        onComplete: function(transport) { 
                                                catchup_callback2(transport); 
                                        } });
@@ -1957,28 +2073,47 @@ function catchupRelativeToArticle(below) {
        }
 }
 
-function cdmExpandArticle(a_id) {
+function cdmExpandArticle(id) {
        try {
-               var id = 'CICD-' + a_id;
 
-               try {
-                       Element.hide("CEXC-" + a_id);
-               } catch (e) { } 
+               var elem = $("CICD-" + active_post_id);
+
+               if (id == active_post_id && Element.visible(elem))
+                       return true;
+
+               cdmSelectArticles("none");
+
+               var old_offset = $("RROW-" + id).offsetTop;
+
+               if (active_post_id && elem) {
+                       Element.hide(elem);
+                       Element.show("CEXC-" + active_post_id);
+               }
+
+               active_post_id = id;
+
+               elem = $("CICD-" + id);
+
+               if (!Element.visible(elem)) {
+                       Element.show(elem);
+                       Element.hide("CEXC-" + id);
+               }
 
-               Effect.Appear(id, {duration : 0.5, 
-                       beforeStart: function(effect) { 
-                               var h_id = 'CICH-' + a_id;
-                               var h_elem = $(h_id);
-                               if (h_elem) { h_elem.style.display = "none"; }
+               var new_offset = $("RROW-" + id).offsetTop;
 
-                               toggleUnread(a_id, 0);
-                       }});
+               $("headlinesInnerContainer").scrollTop += (new_offset-old_offset);
 
+               if ($("RROW-" + id).offsetTop != old_offset) 
+                       $("headlinesInnerContainer").scrollTop = new_offset;
+
+               toggleUnread(id, 0, true);
+               toggleSelected(id);
 
        } catch (e) {
-               exception_error("appearBlockElementF", e);
+               exception_error("cdmExpandArticle", e);
        }
 
+       return false;
 }
 
 function fixHeadlinesOrder(ids) {
@@ -2095,42 +2230,6 @@ function zoomToArticle(id) {
        }
 }
 
-function showOriginalArticleInline(id) {
-       try {
-
-               var query = "backend.php?op=rpc&subop=getArticleLink&id=" + id;
-
-               notify_progress("Loading, please wait...", true);
-
-               new Ajax.Request(query, {
-                       onComplete: function(transport) { 
-
-                               if (transport.responseXML) {
-                       
-                                       var link = transport.responseXML.getElementsByTagName("link")[0];
-                                       var id = transport.responseXML.getElementsByTagName("id")[0];
-
-                                       notify("");
-
-                                       if (link && id) {
-                                               link = link.firstChild.nodeValue;
-
-                                               var ci = $("content-insert");
-
-                                               var tmp = "<iframe id=\"inline_orig_article\" width=\""+ci.offsetWidth+"\" height=\""+ci.offsetHeight+"\" style=\"border-width : 0px;\" src=\""+link+"\"></iframe>";
-
-                                               render_article(tmp);
-
-                                       }
-                               }
-                       } });
-
-       } catch (e) {
-               exception_error("showOriginalArticleInline", e);
-       }
-}
-
-
 function scrollArticle(offset) {
        try {
                if (!isCdmMode()) {
@@ -2212,3 +2311,105 @@ function publishWithNote(id, def_note) {
                exception_error("publishWithNote", e);
        }
 }
+
+function emailArticle(id) {
+       try {
+               if (!id) {
+                       var ids = getSelectedArticleIds2();
+
+                       if (ids.length == 0) {
+                               alert(__("No articles are selected."));
+                               return;
+                       }
+
+                       id = ids.toString();
+               }
+
+               displayDlg('emailArticle', id, 
+                  function () {                                
+                               document.forms['article_email_form'].destination.focus();
+
+                          new Ajax.Autocompleter('destination', 'destination_choices',
+                                  "backend.php?op=rpc&subop=completeEmails",
+                                  { tokens: '', paramName: "search" });
+
+                       });
+
+       } catch (e) {
+               exception_error("emailArticle", e);
+       }
+}
+
+function emailArticleDo() {
+       try {
+               var f = document.forms['article_email_form'];
+
+               if (f.destination.value == "") {
+                       alert("Please fill in the destination email.");
+                       return;
+               }
+
+               if (f.subject.value == "") {
+                       alert("Please fill in the subject.");
+                       return;
+               }
+
+               var query = Form.serialize("article_email_form");
+
+//             console.log(query);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                               try {
+
+                                       var error = transport.responseXML.getElementsByTagName('error')[0];
+
+                                       if (error) {
+                                               alert(__('Error sending email:') + ' ' + error.firstChild.nodeValue);
+                                       } else {
+                                               notify_info('Your message has been sent.');
+                                               closeInfoBox();
+                                       }
+
+                               } catch (e) {
+                                       exception_error("sendEmailDo", e);
+                               }
+
+                       } });
+
+       } catch (e) {
+               exception_error("emailArticleDo", e);
+       }
+}
+
+function cdmDismissArticle(id) {
+       try {
+               var elem = $("RROW-" + id);
+
+               toggleUnread(id, 0, true);
+
+               new Effect.Fade(elem, {duration : 0.5});
+
+       } catch (e) {
+               exception_error("cdmDismissArticle", e);
+       }
+}
+
+function cdmDismissSelectedArticles() {
+       try {
+
+               var ids = getSelectedArticleIds2();
+
+               for (var i = 0; i < ids.length; i++) {
+                       var elem = $("RROW-" + ids[i]);
+                       new Effect.Fade(elem, {duration : 0.5});
+               }
+
+               if (ids.length > 0)
+                       selectionToggleUnread(false);
+
+       } catch (e) {
+               exception_error("cdmDismissArticle", e);
+       }
+}