valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show originating feed info in CDM

This commit is contained in:
Andrew Dolgov 2009-12-28 20:46:11 +03:00
parent ef83538d2e
commit 494a64eaac
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
functions.php
View File

@ -3490,7 +3490,7 @@
ttrss_entries.id,ttrss_entries.title, ttrss_entries.id,ttrss_entries.title,
updated, updated,
note, note,
unread,feed_id,marked,published,link,last_read, unread,feed_id,marked,published,link,last_read,orig_feed_id,
".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms, ".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
$vfeed_query_part $vfeed_query_part
$content_query_part $content_query_part
@ -3522,7 +3522,7 @@
note, note,
ttrss_entries.id as id,title, ttrss_entries.id as id,title,
updated, updated,
unread,feed_id, unread,feed_id,orig_feed_id,
marked,link,last_read, marked,link,last_read,
".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms, ".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
$vfeed_query_part $vfeed_query_part
@ -5130,20 +5130,12 @@
$is_unread = false; $is_unread = false;
} }
$is_ie = (strpos($_SESSION["client.userAgent"], "MSIE") !== false);
if ($is_ie) {
$mark_img_ext = "gif";
} else {
$mark_img_ext = "png";
}
if ($line["marked"] == "t" || $line["marked"] == "1") { if ($line["marked"] == "t" || $line["marked"] == "1") {
$marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_set.$mark_img_ext\" $marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_set.png\"
class=\"markedPic\" class=\"markedPic\"
alt=\"Unstar article\" onclick='javascript:tMark($id)'>"; alt=\"Unstar article\" onclick='javascript:tMark($id)'>";
} else { } else {
$marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_unset.$mark_img_ext\" $marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_unset.png\"
class=\"markedPic\" class=\"markedPic\"
alt=\"Star article\" onclick='javascript:tMark($id)'>"; alt=\"Star article\" onclick='javascript:tMark($id)'>";
} }
@ -5409,6 +5401,33 @@
onclick=\"cdmClicked($id)\" onclick=\"cdmClicked($id)\"
id=\"CICD-$id\" $cdm_cstyle>"; id=\"CICD-$id\" $cdm_cstyle>";
if ($line["orig_feed_id"]) {
$tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds
WHERE id = ".$line["orig_feed_id"]);
if (db_num_rows($tmp_result) != 0) {
print "<div clear='both'>";
print __("Originally from:");
print "&nbsp;";
$tmp_line = db_fetch_assoc($tmp_result);
print "<a target='_blank'
href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
$tmp_line['title'] . "</a>";
print "&nbsp;";
print "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
print "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";
print "</div>";
}
}
// print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>"; // print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>";
print "<div id=\"POSTNOTE-$id\">"; print "<div id=\"POSTNOTE-$id\">";