move to simpler CDM handling of encoded content (instead of CENCW... etc)

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index 90797270eb9ea4fbc534c3eb2bd5e33cc6f0ec86..0c1db62b6765b5c2f607e50be7c7fb35fda44085 100755 (executable)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -499,8 +499,10 @@ class Feeds extends Handler_Protected {
 
                                        $expanded_class = $expand_cdm ? "expanded" : "expandable";
 
-                                       $tmp_content = "<div class=\"cdm $hlc_suffix $expanded_class $class\"
-                    id=\"RROW-$id\" data-article-id='$id' data-orig-feed-id='$feed_id' $mouseover_attrs>";
+                    $content_encoded = htmlspecialchars(json_encode($line["content"]));
+
+                    $tmp_content = "<div class=\"cdm $hlc_suffix $expanded_class $class\"
+                        id=\"RROW-$id\" data-content=\"$content_encoded\" data-article-id='$id' data-orig-feed-id='$feed_id' $mouseover_attrs>";
 
                                        $tmp_content .= "<div class=\"cdmHeader\">";
                                        $tmp_content .= "<div style=\"vertical-align : middle\">";
@@ -616,14 +618,7 @@ class Feeds extends Handler_Protected {
                                                }
                                        }
 
-                                       $tmp_content .= "<span id=\"CWRAP-$id\">";
-                                       $tmp_content .= "<span id=\"CENCW-$id\" class=\"cencw\" style=\"display : none\">";
-                                       $tmp_content .= htmlspecialchars($line["content"]);
-                                       $tmp_content .= "</span>";
-                                       $tmp_content .= "</span>";
-
                                        $tmp_content .= "</div>"; //cdmContentInner
-
                                        $tmp_content .= "<div class=\"cdmIntermediate\">";
 
                                        $always_display_enclosures = $line["always_display_enclosures"];
@@ -632,7 +627,7 @@ class Feeds extends Handler_Protected {
 
                                        $tmp_content .= "</div>"; // cdmIntermediate
 
-                                       $tmp_content .= "<div class=\"cdmFooter\" onclick=\"cdmFooterClick(event)\">";
+                                       $tmp_content .= "<div class=\"cdmFooter\" onclick=\"event.stopPropagation()\">";
 
                                        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
                                                $tmp_content .= $p->hook_article_left_button($line);
@@ -1134,6 +1129,9 @@ class Feeds extends Handler_Protected {
        function update_debugger() {
                header("Content-type: text/html");
 
+               Debug::set_enabled(true);
+               Debug::set_loglevel($_REQUEST["xdebug"]);
+
                $feed_id = (int)$_REQUEST["feed_id"];
                @$do_update = $_REQUEST["action"] == "do_update";
                $csrf_token = $_REQUEST["csrf_token"];