banananetwork
/
tt-rss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some remaining old-style viewfeed() calls

Browse Source
master
Andrew Dolgov 9 years ago
parent ecbd467e64
commit dcbe36b2a2
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
classes/dlg.php
Unescape Escape View File

@ -144,7 +144,7 @@ class Dlg extends Handler_Protected {
$key_escaped = str_replace("'", "\\'", $key); $key_escaped = str_replace("'", "\\'", $key);
echo "<a href=\"javascript:viewfeed('$key_escaped') \" style=\"font-size: " . echo "<a href=\"javascript:viewfeed({feed:'$key_escaped'}) \" style=\"font-size: " .
$size . "px\" title=\"$value articles tagged with " . $size . "px\" title=\"$value articles tagged with " .
$key . '">' . $key . '</a> '; $key . '">' . $key . '</a> ';
} }

12
classes/feeds.php
Unescape Escape View File

@ -455,7 +455,7 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>". $reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
"<div style='float : right'>$feed_icon_img</div>". "<div style='float : right'>$feed_icon_img</div>".
"<a class='title' href=\"#\" onclick=\"viewfeed($feed_id)\">". "<a class='title' href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
$line["feed_title"]."</a> $line["feed_title"]."</a>
$vf_catchup_link</div>"; $vf_catchup_link</div>";
@ -500,7 +500,7 @@ class Feeds extends Handler_Protected {
if (@$line["feed_title"]) { if (@$line["feed_title"]) {
$rgba = @$rgba_cache[$feed_id]; $rgba = @$rgba_cache[$feed_id];
$reply['content'] .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed($feed_id)\">". $reply['content'] .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
truncate_string($line["feed_title"],30)."</a></span>"; truncate_string($line["feed_title"],30)."</a></span>";
} }
} }
@ -517,7 +517,7 @@ class Feeds extends Handler_Protected {
if ($line["feed_title"] && !$vfeed_group_enabled) { if ($line["feed_title"] && !$vfeed_group_enabled) {
$reply['content'] .= "<span onclick=\"viewfeed($feed_id)\" $reply['content'] .= "<span onclick=\"viewfeed({feed:$feed_id})\"
style=\"cursor : pointer\" style=\"cursor : pointer\"
title=\"".htmlspecialchars($line['feed_title'])."\"> title=\"".htmlspecialchars($line['feed_title'])."\">
$feed_icon_img</span>"; $feed_icon_img</span>";
@ -560,7 +560,7 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>". $reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
"<div style=\"float : right\">$feed_icon_img</div>". "<div style=\"float : right\">$feed_icon_img</div>".
"<a href=\"#\" class='title' onclick=\"viewfeed($feed_id)\">". "<a href=\"#\" class='title' onclick=\"viewfeed({feed:$feed_id})\">".
$line["feed_title"]."</a> $vf_catchup_link</div>"; $line["feed_title"]."</a> $vf_catchup_link</div>";
} }
@ -624,7 +624,7 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "<div class=\"hlFeed\"> $reply['content'] .= "<div class=\"hlFeed\">
<a href=\"#\" style=\"background-color: rgba($rgba,0.3)\" <a href=\"#\" style=\"background-color: rgba($rgba,0.3)\"
onclick=\"viewfeed($feed_id)\">". onclick=\"viewfeed({feed:$feed_id})\">".
truncate_string($line["feed_title"],30)."</a> truncate_string($line["feed_title"],30)."</a>
</div>"; </div>";
} }
@ -639,7 +639,7 @@ class Feeds extends Handler_Protected {
if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) { if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
$reply['content'] .= "<span style=\"cursor : pointer\" $reply['content'] .= "<span style=\"cursor : pointer\"
title=\"".htmlspecialchars($line["feed_title"])."\" title=\"".htmlspecialchars($line["feed_title"])."\"
onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>"; onclick=\"viewfeed({feed:$feed_id})\">$feed_icon_img</span>";
} }
$reply['content'] .= "</div>"; $reply['content'] .= "</div>";

2
include/functions2.php
Unescape Escape View File

@ -1618,7 +1618,7 @@
$tags_str = ""; $tags_str = "";
for ($i = 0; $i < $maxtags; $i++) { for ($i = 0; $i < $maxtags; $i++) {
$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed('".$tags[$i]."')\">" . $tags[$i] . "</a>, "; $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, ";
} }
$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2); $tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);

2
js/functions.js
Unescape Escape View File

@ -1240,7 +1240,7 @@ function unsubscribeFeed(feed_id, title) {
updateFeedList(); updateFeedList();
} else { } else {
if (feed_id == getActiveFeedId()) if (feed_id == getActiveFeedId())
setTimeout("viewfeed(-5)", 100); setTimeout("viewfeed({feed:-5})", 100);
if (feed_id < 0) updateFeedList(); if (feed_id < 0) updateFeedList();
} }

2
plugins/af_psql_trgm/init.php
Unescape Escape View File

@ -88,7 +88,7 @@ class Af_Psql_Trgm extends Plugin {
print " <a target=\"_blank\" href=\"$article_link\">". print " <a target=\"_blank\" href=\"$article_link\">".
$line["title"]."</a>"; $line["title"]."</a>";
print " (<a href=\"#\" onclick=\"viewfeed(".$line["feed_id"].")\">". print " (<a href=\"#\" onclick=\"viewfeed({feed:".$line["feed_id"]."})\">".
htmlspecialchars($line["feed_title"])."</a>)"; htmlspecialchars($line["feed_title"])."</a>)";
print " <span class='insensitive'>($sm)</span>"; print " <span class='insensitive'>($sm)</span>";

Write Preview
Loading…
Cancel
Save