strip_harmful_tags: remove data- attributes

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

diff --git a/classes/feeds.php b/classes/feeds.php
index fd3d8f757cfda1e91312ad9214db1f1084c7eb00..09bfdea7257fcdd4df4262424b9af0fceb82e020 100755 (executable)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -362,9 +362,7 @@ class Feeds extends Handler_Protected {
                                        $entry_author = " — $entry_author";
                                }
 
-                               $has_feed_icon = feeds::feedHasIcon($feed_id);
-
-                               if ($has_feed_icon) {
+                               if (feeds::feedHasIcon($feed_id)) {
                                        $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
                                } else {
                                        $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.png\" alt=\"\">";
@@ -392,7 +390,7 @@ class Feeds extends Handler_Protected {
 
                                                        $vf_catchup_link = "<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
 
-                                                       $reply['content'] .= "<div data-feed-id='$feed_id' id='FTITLE-$feed_id' class='cdmFeedTitle'>".
+                                                       $reply['content'] .= "<div data-feed-id='$feed_id' class='cdmFeedTitle'>".
                                                                "<div style='float : right'>$feed_icon_img</div>".
                                                                "<a class='title' href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
                                                                $line["feed_title"]."</a>
@@ -417,7 +415,7 @@ class Feeds extends Handler_Protected {
 
                                        $reply['content'] .= "<div onclick='return hlClicked(event, $id)'
                     class=\"hlTitle\"><span class='hlContent $hlc_suffix'>";
-                                       $reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\"
+                                       $reply['content'] .= "<a class=\"title $hlc_suffix\"
                     href=\"" . htmlspecialchars($line["link"]) . "\"
                     onclick=\"\">" .
                                                truncate_string($line["title"], 200);
@@ -488,7 +486,7 @@ class Feeds extends Handler_Protected {
                                                        $feed_icon_src = Feeds::getFeedIcon($feed_id);
                                                        $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"$feed_icon_src\">";
 
-                                                       $reply['content'] .= "<div data-feed-id='$feed_id' id='FTITLE-$feed_id' class='cdmFeedTitle'>".
+                                                       $reply['content'] .= "<div data-feed-id='$feed_id' class='cdmFeedTitle'>".
                                                                "<div style=\"float : right\">$feed_icon_img</div>".
                                                                "<a href=\"#\" class='title' onclick=\"viewfeed({feed:$feed_id})\">".
                                                                $line["feed_title"]."</a> $vf_catchup_link</div>";
@@ -496,7 +494,7 @@ class Feeds extends Handler_Protected {
                                                }
                                        }
 
-                    $content_encoded = htmlspecialchars(json_encode($line["content"]));
+                    $content_encoded = htmlspecialchars($line["content"]);
 
                     $tmp_content = "<div class=\"cdm expanded $hlc_suffix $class\"
                         id=\"RROW-$id\" data-content=\"$content_encoded\" data-article-id='$id' data-orig-feed-id='$feed_id' $mouseover_attrs>";
@@ -523,7 +521,7 @@ class Feeds extends Handler_Protected {
                                        }
 
                                        // data-article-id included for context menu
-                                       $tmp_content .= "<span id=\"RTITLE-$id\"
+                                       $tmp_content .= "<span
                     onclick=\"return cdmClicked(event, $id);\"
                     data-article-id=\"$id\"
                     class=\"titleWrap hlMenuAttach $hlc_suffix\">
@@ -564,7 +562,7 @@ class Feeds extends Handler_Protected {
 
                                        $tmp_content .= "</div>"; //cdmHeader
 
-                                       $tmp_content .= "<div class=\"cdmContent\" onclick=\"return cdmClicked(event, $id, true);\" id=\"CICD-$id\">";
+                                       $tmp_content .= "<div class=\"cdmContent\" onclick=\"return cdmClicked(event, $id, true);\">";
 
                                        $tmp_content .= "<div id=\"POSTNOTE-$id\">";
                                        if ($line['note']) {