move the following to Article:
+ static function format_article_enclosures($id, $always_display_enclosures,
+ static function format_article($id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
+ static function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
+ static function format_tags_string($tags) {
+ static function format_article_labels($labels) {
+ static function format_article_note($id, $note, $allow_edit = true) {
+ static function get_article_enclosures($id) {
This commit is contained in:
Andrew Dolgov
parent
4122da0290
commit
7e5f8d9fb3
5 changed files with 499 additions and 501 deletions
|
|
@ -347,7 +347,7 @@ class API extends Handler {
|
|||
|
||||
while ($line = $this->dbh->fetch_assoc($result)) {
|
||||
|
||||
$attachments = get_article_enclosures($line['id']);
|
||||
$attachments = Article::get_article_enclosures($line['id']);
|
||||
|
||||
$article = array(
|
||||
"id" => $line["id"],
|
||||
|
|
@ -769,7 +769,7 @@ class API extends Handler {
|
|||
);
|
||||
|
||||
if ($include_attachments)
|
||||
$headline_row['attachments'] = get_article_enclosures(
|
||||
$headline_row['attachments'] = Article::get_article_enclosures(
|
||||
$line['id']);
|
||||
|
||||
if ($show_excerpt)
|
||||
|
|
|
|||
|
|
@ -37,16 +37,16 @@ class Article extends Handler_Protected {
|
|||
$articles = array();
|
||||
|
||||
if ($mode == "") {
|
||||
array_push($articles, format_article($id, false));
|
||||
array_push($articles, $this->format_article($id, false));
|
||||
} else if ($mode == "zoom") {
|
||||
array_push($articles, format_article($id, true, true));
|
||||
array_push($articles, $this->format_article($id, true, true));
|
||||
} else if ($mode == "raw") {
|
||||
if (isset($_REQUEST['html'])) {
|
||||
header("Content-Type: text/html");
|
||||
print '<link rel="stylesheet" type="text/css" href="css/tt-rss.css"/>';
|
||||
}
|
||||
|
||||
$article = format_article($id, false, isset($_REQUEST["zoom"]));
|
||||
$article = $this->format_article($id, false, isset($_REQUEST["zoom"]));
|
||||
print $article['content'];
|
||||
return;
|
||||
}
|
||||
|
|
@ -56,7 +56,7 @@ class Article extends Handler_Protected {
|
|||
if (!$_SESSION["bw_limit"]) {
|
||||
foreach ($cids as $cid) {
|
||||
if ($cid) {
|
||||
array_push($articles, format_article($cid, false, false));
|
||||
array_push($articles, $this->format_article($cid, false, false));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -198,7 +198,7 @@ class Article extends Handler_Protected {
|
|||
|
||||
$param = $this->dbh->escape_string($_REQUEST['param']);
|
||||
|
||||
$tags = get_article_tags($this->dbh->escape_string($param));
|
||||
$tags = Article::get_article_tags($this->dbh->escape_string($param));
|
||||
|
||||
$tags_str = join(", ", $tags);
|
||||
|
||||
|
|
@ -304,8 +304,8 @@ class Article extends Handler_Protected {
|
|||
|
||||
$this->dbh->query("COMMIT");
|
||||
|
||||
$tags = get_article_tags($id);
|
||||
$tags_str = format_tags_string($tags, $id);
|
||||
$tags = Article::get_article_tags($id);
|
||||
$tags_str = $this->format_tags_string($tags, $id);
|
||||
$tags_str_full = join(", ", $tags);
|
||||
|
||||
if (!$tags_str_full) $tags_str_full = __("no tags");
|
||||
|
|
@ -361,7 +361,7 @@ class Article extends Handler_Protected {
|
|||
$labels = get_article_labels($id, $_SESSION["uid"]);
|
||||
|
||||
array_push($reply["info-for-headlines"],
|
||||
array("id" => $id, "labels" => format_article_labels($labels)));
|
||||
array("id" => $id, "labels" => $this->format_article_labels($labels)));
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -382,5 +382,486 @@ class Article extends Handler_Protected {
|
|||
}
|
||||
}
|
||||
|
||||
static function format_article_enclosures($id, $always_display_enclosures,
|
||||
$article_content, $hide_images = false) {
|
||||
|
||||
$result = Article::get_article_enclosures($id);
|
||||
$rv = '';
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ENCLOSURES) as $plugin) {
|
||||
$retval = $plugin->hook_format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images);
|
||||
if (is_array($retval)) {
|
||||
$rv = $retval[0];
|
||||
$result = $retval[1];
|
||||
} else {
|
||||
$rv = $retval;
|
||||
}
|
||||
}
|
||||
unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
|
||||
|
||||
if ($rv === '' && !empty($result)) {
|
||||
$entries_html = array();
|
||||
$entries = array();
|
||||
$entries_inline = array();
|
||||
|
||||
foreach ($result as $line) {
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ENCLOSURE_ENTRY) as $plugin) {
|
||||
$line = $plugin->hook_enclosure_entry($line);
|
||||
}
|
||||
|
||||
$url = $line["content_url"];
|
||||
$ctype = $line["content_type"];
|
||||
$title = $line["title"];
|
||||
$width = $line["width"];
|
||||
$height = $line["height"];
|
||||
|
||||
if (!$ctype) $ctype = __("unknown type");
|
||||
|
||||
//$filename = substr($url, strrpos($url, "/")+1);
|
||||
$filename = basename($url);
|
||||
|
||||
$player = format_inline_player($url, $ctype);
|
||||
|
||||
if ($player) array_push($entries_inline, $player);
|
||||
|
||||
# $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\" rel=\"noopener noreferrer\">" .
|
||||
# $filename . " (" . $ctype . ")" . "</a>";
|
||||
|
||||
$entry = "<div onclick=\"openUrlPopup('".htmlspecialchars($url)."')\"
|
||||
dojoType=\"dijit.MenuItem\">$filename ($ctype)</div>";
|
||||
|
||||
array_push($entries_html, $entry);
|
||||
|
||||
$entry = array();
|
||||
|
||||
$entry["type"] = $ctype;
|
||||
$entry["filename"] = $filename;
|
||||
$entry["url"] = $url;
|
||||
$entry["title"] = $title;
|
||||
$entry["width"] = $width;
|
||||
$entry["height"] = $height;
|
||||
|
||||
array_push($entries, $entry);
|
||||
}
|
||||
|
||||
if ($_SESSION['uid'] && !get_pref("STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
|
||||
if ($always_display_enclosures ||
|
||||
!preg_match("/<img/i", $article_content)) {
|
||||
|
||||
foreach ($entries as $entry) {
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin)
|
||||
$retval = $plugin->hook_render_enclosure($entry, $hide_images);
|
||||
|
||||
|
||||
if ($retval) {
|
||||
$rv .= $retval;
|
||||
} else {
|
||||
|
||||
if (preg_match("/image/", $entry["type"])) {
|
||||
|
||||
if (!$hide_images) {
|
||||
$encsize = '';
|
||||
if ($entry['height'] > 0)
|
||||
$encsize .= ' height="' . intval($entry['height']) . '"';
|
||||
if ($entry['width'] > 0)
|
||||
$encsize .= ' width="' . intval($entry['width']) . '"';
|
||||
$rv .= "<p><img
|
||||
alt=\"".htmlspecialchars($entry["filename"])."\"
|
||||
src=\"" .htmlspecialchars($entry["url"]) . "\"
|
||||
" . $encsize . " /></p>";
|
||||
} else {
|
||||
$rv .= "<p><a target=\"_blank\" rel=\"noopener noreferrer\"
|
||||
href=\"".htmlspecialchars($entry["url"])."\"
|
||||
>" .htmlspecialchars($entry["url"]) . "</a></p>";
|
||||
}
|
||||
|
||||
if ($entry['title']) {
|
||||
$rv.= "<div class=\"enclosure_title\">${entry['title']}</div>";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (count($entries_inline) > 0) {
|
||||
$rv .= "<hr clear='both'/>";
|
||||
foreach ($entries_inline as $entry) { $rv .= $entry; };
|
||||
$rv .= "<hr clear='both'/>";
|
||||
}
|
||||
|
||||
$rv .= "<div class=\"attachments\" dojoType=\"dijit.form.DropDownButton\">".
|
||||
"<span>" . __('Attachments')."</span>";
|
||||
|
||||
$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
|
||||
|
||||
foreach ($entries as $entry) {
|
||||
if ($entry["title"])
|
||||
$title = " — " . truncate_string($entry["title"], 30);
|
||||
else
|
||||
$title = "";
|
||||
|
||||
if ($entry["filename"])
|
||||
$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
|
||||
else
|
||||
$filename = "";
|
||||
|
||||
$rv .= "<div onclick='openUrlPopup(\"".htmlspecialchars($entry["url"])."\")'
|
||||
dojoType=\"dijit.MenuItem\">".$filename . $title."</div>";
|
||||
|
||||
};
|
||||
|
||||
$rv .= "</div>";
|
||||
$rv .= "</div>";
|
||||
}
|
||||
|
||||
return $rv;
|
||||
}
|
||||
|
||||
static function format_article($id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
|
||||
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
|
||||
|
||||
$rv = array();
|
||||
|
||||
$rv['id'] = $id;
|
||||
|
||||
/* we can figure out feed_id from article id anyway, why do we
|
||||
* pass feed_id here? let's ignore the argument :(*/
|
||||
|
||||
$result = db_query("SELECT feed_id FROM ttrss_user_entries
|
||||
WHERE ref_id = '$id'");
|
||||
|
||||
$feed_id = (int) db_fetch_result($result, 0, "feed_id");
|
||||
|
||||
$rv['feed_id'] = $feed_id;
|
||||
|
||||
//if (!$zoom_mode) { print "<article id='$id'><![CDATA["; };
|
||||
|
||||
if ($mark_as_read) {
|
||||
$result = db_query("UPDATE ttrss_user_entries
|
||||
SET unread = false,last_read = NOW()
|
||||
WHERE ref_id = '$id' AND owner_uid = $owner_uid");
|
||||
|
||||
ccache_update($feed_id, $owner_uid);
|
||||
}
|
||||
|
||||
$result = db_query("SELECT id,title,link,content,feed_id,comments,int_id,lang,
|
||||
".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
|
||||
(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
|
||||
(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
|
||||
(SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images,
|
||||
(SELECT always_display_enclosures FROM ttrss_feeds WHERE id = feed_id) as always_display_enclosures,
|
||||
num_comments,
|
||||
tag_cache,
|
||||
author,
|
||||
guid,
|
||||
orig_feed_id,
|
||||
note
|
||||
FROM ttrss_entries,ttrss_user_entries
|
||||
WHERE id = '$id' AND ref_id = id AND owner_uid = $owner_uid");
|
||||
|
||||
if ($result) {
|
||||
|
||||
$line = db_fetch_assoc($result);
|
||||
|
||||
$line["tags"] = Article::get_article_tags($id, $owner_uid, $line["tag_cache"]);
|
||||
unset($line["tag_cache"]);
|
||||
|
||||
$line["content"] = sanitize($line["content"],
|
||||
sql_bool_to_bool($line['hide_images']),
|
||||
$owner_uid, $line["site_url"], false, $line["id"]);
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
|
||||
$line = $p->hook_render_article($line);
|
||||
}
|
||||
|
||||
$num_comments = (int) $line["num_comments"];
|
||||
$entry_comments = "";
|
||||
|
||||
if ($num_comments > 0) {
|
||||
if ($line["comments"]) {
|
||||
$comments_url = htmlspecialchars($line["comments"]);
|
||||
} else {
|
||||
$comments_url = htmlspecialchars($line["link"]);
|
||||
}
|
||||
$entry_comments = "<a class=\"postComments\"
|
||||
target='_blank' rel=\"noopener noreferrer\" href=\"$comments_url\">$num_comments ".
|
||||
_ngettext("comment", "comments", $num_comments)."</a>";
|
||||
|
||||
} else {
|
||||
if ($line["comments"] && $line["link"] != $line["comments"]) {
|
||||
$entry_comments = "<a class=\"postComments\" target='_blank' rel=\"noopener noreferrer\" href=\"".htmlspecialchars($line["comments"])."\">".__("comments")."</a>";
|
||||
}
|
||||
}
|
||||
|
||||
if ($zoom_mode) {
|
||||
header("Content-Type: text/html");
|
||||
$rv['content'] .= "<html><head>
|
||||
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
|
||||
<title>Tiny Tiny RSS - ".$line["title"]."</title>".
|
||||
stylesheet_tag("css/tt-rss.css").
|
||||
stylesheet_tag("css/zoom.css").
|
||||
stylesheet_tag("css/dijit.css")."
|
||||
|
||||
<link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
|
||||
<link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
|
||||
|
||||
</head><body id=\"ttrssZoom\">";
|
||||
}
|
||||
|
||||
$rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">";
|
||||
|
||||
$rv['content'] .= "<div class=\"postHeader\" id=\"POSTHDR-$id\">";
|
||||
|
||||
$entry_author = $line["author"];
|
||||
|
||||
if ($entry_author) {
|
||||
$entry_author = __(" - ") . $entry_author;
|
||||
}
|
||||
|
||||
$parsed_updated = make_local_datetime($line["updated"], true,
|
||||
$owner_uid, true);
|
||||
|
||||
if (!$zoom_mode)
|
||||
$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
|
||||
|
||||
if ($line["link"]) {
|
||||
$rv['content'] .= "<div class='postTitle'><a target='_blank' rel='noopener noreferrer'
|
||||
title=\"".htmlspecialchars($line['title'])."\"
|
||||
href=\"" .
|
||||
htmlspecialchars($line["link"]) . "\">" .
|
||||
$line["title"] . "</a>" .
|
||||
"<span class='author'>$entry_author</span></div>";
|
||||
} else {
|
||||
$rv['content'] .= "<div class='postTitle'>" . $line["title"] . "$entry_author</div>";
|
||||
}
|
||||
|
||||
if ($zoom_mode) {
|
||||
$feed_title = htmlspecialchars($line["feed_title"]);
|
||||
|
||||
$rv['content'] .= "<div class=\"postFeedTitle\">$feed_title</div>";
|
||||
|
||||
$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
|
||||
}
|
||||
|
||||
$tags_str = Article::format_tags_string($line["tags"], $id);
|
||||
$tags_str_full = join(", ", $line["tags"]);
|
||||
|
||||
if (!$tags_str_full) $tags_str_full = __("no tags");
|
||||
|
||||
if (!$entry_comments) $entry_comments = " "; # placeholder
|
||||
|
||||
$rv['content'] .= "<div class='postTags' style='float : right'>
|
||||
<img src='images/tag.png'
|
||||
class='tagsPic' alt='Tags' title='Tags'> ";
|
||||
|
||||
if (!$zoom_mode) {
|
||||
$rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>
|
||||
<a title=\"".__('Edit tags for this article')."\"
|
||||
href=\"#\" onclick=\"editArticleTags($id, $feed_id)\">(+)</a>";
|
||||
|
||||
$rv['content'] .= "<div dojoType=\"dijit.Tooltip\"
|
||||
id=\"ATSTRTIP-$id\" connectId=\"ATSTR-$id\"
|
||||
position=\"below\">$tags_str_full</div>";
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
|
||||
$rv['content'] .= $p->hook_article_button($line);
|
||||
}
|
||||
|
||||
} else {
|
||||
$tags_str = strip_tags($tags_str);
|
||||
$rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>";
|
||||
}
|
||||
$rv['content'] .= "</div>";
|
||||
$rv['content'] .= "<div clear='both'>";
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
|
||||
$rv['content'] .= $p->hook_article_left_button($line);
|
||||
}
|
||||
|
||||
$rv['content'] .= "$entry_comments</div>";
|
||||
|
||||
if ($line["orig_feed_id"]) {
|
||||
|
||||
$tmp_result = db_query("SELECT * FROM ttrss_archived_feeds
|
||||
WHERE id = ".$line["orig_feed_id"] . " AND owner_uid = " . $_SESSION["uid"]);
|
||||
|
||||
if (db_num_rows($tmp_result) != 0) {
|
||||
|
||||
$rv['content'] .= "<div clear='both'>";
|
||||
$rv['content'] .= __("Originally from:");
|
||||
|
||||
$rv['content'] .= " ";
|
||||
|
||||
$tmp_line = db_fetch_assoc($tmp_result);
|
||||
|
||||
$rv['content'] .= "<a target='_blank' rel='noopener noreferrer'
|
||||
href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
|
||||
$tmp_line['title'] . "</a>";
|
||||
|
||||
$rv['content'] .= " ";
|
||||
|
||||
$rv['content'] .= "<a target='_blank' rel='noopener noreferrer' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
|
||||
$rv['content'] .= "<img title='".__('Feed URL')."' class='tinyFeedIcon' src='images/pub_set.png'></a>";
|
||||
|
||||
$rv['content'] .= "</div>";
|
||||
}
|
||||
}
|
||||
|
||||
$rv['content'] .= "</div>";
|
||||
|
||||
$rv['content'] .= "<div id=\"POSTNOTE-$id\">";
|
||||
if ($line['note']) {
|
||||
$rv['content'] .= Article::format_article_note($id, $line['note'], !$zoom_mode);
|
||||
}
|
||||
$rv['content'] .= "</div>";
|
||||
|
||||
if (!$line['lang']) $line['lang'] = 'en';
|
||||
|
||||
$rv['content'] .= "<div class=\"postContent\" lang=\"".$line['lang']."\">";
|
||||
|
||||
$rv['content'] .= $line["content"];
|
||||
|
||||
if (!$zoom_mode) {
|
||||
$rv['content'] .= Article::format_article_enclosures($id,
|
||||
sql_bool_to_bool($line["always_display_enclosures"]),
|
||||
$line["content"],
|
||||
sql_bool_to_bool($line["hide_images"]));
|
||||
}
|
||||
|
||||
$rv['content'] .= "</div>";
|
||||
|
||||
$rv['content'] .= "</div>";
|
||||
|
||||
}
|
||||
|
||||
if ($zoom_mode) {
|
||||
$rv['content'] .= "
|
||||
<div class='footer'>
|
||||
<button onclick=\"return window.close()\">".
|
||||
__("Close this window")."</button></div>";
|
||||
$rv['content'] .= "</body></html>";
|
||||
}
|
||||
|
||||
return $rv;
|
||||
|
||||
}
|
||||
|
||||
static function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
|
||||
|
||||
$a_id = db_escape_string($id);
|
||||
|
||||
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
|
||||
|
||||
$query = "SELECT DISTINCT tag_name,
|
||||
owner_uid as owner FROM
|
||||
ttrss_tags WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
|
||||
ref_id = '$a_id' AND owner_uid = '$owner_uid' LIMIT 1) ORDER BY tag_name";
|
||||
|
||||
$tags = array();
|
||||
|
||||
/* check cache first */
|
||||
|
||||
if ($tag_cache === false) {
|
||||
$result = db_query("SELECT tag_cache FROM ttrss_user_entries
|
||||
WHERE ref_id = '$id' AND owner_uid = $owner_uid");
|
||||
|
||||
if (db_num_rows($result) != 0)
|
||||
$tag_cache = db_fetch_result($result, 0, "tag_cache");
|
||||
}
|
||||
|
||||
if ($tag_cache) {
|
||||
$tags = explode(",", $tag_cache);
|
||||
} else {
|
||||
|
||||
/* do it the hard way */
|
||||
|
||||
$tmp_result = db_query($query);
|
||||
|
||||
while ($tmp_line = db_fetch_assoc($tmp_result)) {
|
||||
array_push($tags, $tmp_line["tag_name"]);
|
||||
}
|
||||
|
||||
/* update the cache */
|
||||
|
||||
$tags_str = db_escape_string(join(",", $tags));
|
||||
|
||||
db_query("UPDATE ttrss_user_entries
|
||||
SET tag_cache = '$tags_str' WHERE ref_id = '$id'
|
||||
AND owner_uid = $owner_uid");
|
||||
}
|
||||
|
||||
return $tags;
|
||||
}
|
||||
|
||||
static function format_tags_string($tags) {
|
||||
if (!is_array($tags) || count($tags) == 0) {
|
||||
return __("no tags");
|
||||
} else {
|
||||
$maxtags = min(5, count($tags));
|
||||
$tags_str = "";
|
||||
|
||||
for ($i = 0; $i < $maxtags; $i++) {
|
||||
$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);
|
||||
|
||||
if (count($tags) > $maxtags)
|
||||
$tags_str .= ", …";
|
||||
|
||||
return $tags_str;
|
||||
}
|
||||
}
|
||||
|
||||
static function format_article_labels($labels) {
|
||||
|
||||
if (!is_array($labels)) return '';
|
||||
|
||||
$labels_str = "";
|
||||
|
||||
foreach ($labels as $l) {
|
||||
$labels_str .= sprintf("<span class='hlLabelRef'
|
||||
style='color : %s; background-color : %s'>%s</span>",
|
||||
$l[2], $l[3], $l[1]);
|
||||
}
|
||||
|
||||
return $labels_str;
|
||||
|
||||
}
|
||||
|
||||
static function format_article_note($id, $note, $allow_edit = true) {
|
||||
|
||||
$str = "<div class='articleNote' onclick=\"editArticleNote($id)\">
|
||||
<div class='noteEdit' onclick=\"editArticleNote($id)\">".
|
||||
($allow_edit ? __('(edit note)') : "")."</div>$note</div>";
|
||||
|
||||
return $str;
|
||||
}
|
||||
|
||||
static function get_article_enclosures($id) {
|
||||
|
||||
$query = "SELECT * FROM ttrss_enclosures
|
||||
WHERE post_id = '$id' AND content_url != ''";
|
||||
|
||||
$rv = array();
|
||||
|
||||
$result = db_query($query);
|
||||
|
||||
if (db_num_rows($result) > 0) {
|
||||
while ($line = db_fetch_assoc($result)) {
|
||||
|
||||
if (file_exists(CACHE_DIR . '/images/' . sha1($line["content_url"]))) {
|
||||
$line["content_url"] = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($line["content_url"]);
|
||||
}
|
||||
|
||||
array_push($rv, $line);
|
||||
}
|
||||
}
|
||||
|
||||
return $rv;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ class Feeds extends Handler_Protected {
|
|||
if (!is_array($labels)) $labels = get_article_labels($id);
|
||||
|
||||
$labels_str = "<span class=\"HLLCTR-$id\">";
|
||||
$labels_str .= format_article_labels($labels);
|
||||
$labels_str .= Article::format_article_labels($labels);
|
||||
$labels_str .= "</span>";
|
||||
|
||||
if (count($topmost_article_ids) < 3) {
|
||||
|
|
@ -672,7 +672,7 @@ class Feeds extends Handler_Protected {
|
|||
|
||||
$reply['content'] .= "<div id=\"POSTNOTE-$id\">";
|
||||
if ($line['note']) {
|
||||
$reply['content'] .= format_article_note($id, $line['note']);
|
||||
$reply['content'] .= Article::format_article_note($id, $line['note']);
|
||||
}
|
||||
$reply['content'] .= "</div>";
|
||||
|
||||
|
|
@ -720,7 +720,7 @@ class Feeds extends Handler_Protected {
|
|||
$reply['content'] .= "<div class=\"cdmIntermediate\">";
|
||||
|
||||
$always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
|
||||
$reply['content'] .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
|
||||
$reply['content'] .= Article::format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
|
||||
|
||||
$reply['content'] .= "</div>";
|
||||
|
||||
|
|
@ -730,7 +730,7 @@ class Feeds extends Handler_Protected {
|
|||
$reply['content'] .= $p->hook_article_left_button($line);
|
||||
}
|
||||
|
||||
$tags_str = format_tags_string($tags, $id);
|
||||
$tags_str = Article::format_tags_string($tags, $id);
|
||||
|
||||
$reply['content'] .= "<span class='left'>";
|
||||
|
||||
|
|
|
|||
|
|
@ -166,14 +166,14 @@ class Handler_Public extends Handler {
|
|||
$tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
|
||||
$tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
|
||||
|
||||
$tags = get_article_tags($line["id"], $owner_uid);
|
||||
$tags = Article::get_article_tags($line["id"], $owner_uid);
|
||||
|
||||
foreach ($tags as $tag) {
|
||||
$tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
|
||||
$tpl->addBlock('category');
|
||||
}
|
||||
|
||||
$enclosures = get_article_enclosures($line["id"]);
|
||||
$enclosures = Article::get_article_enclosures($line["id"]);
|
||||
|
||||
foreach ($enclosures as $e) {
|
||||
$type = htmlspecialchars($e['content_type']);
|
||||
|
|
@ -252,7 +252,7 @@ class Handler_Public extends Handler {
|
|||
}
|
||||
}
|
||||
|
||||
$enclosures = get_article_enclosures($line["id"]);
|
||||
$enclosures = Article::get_article_enclosures($line["id"]);
|
||||
|
||||
if (count($enclosures) > 0) {
|
||||
$article['enclosures'] = array();
|
||||
|
|
@ -402,7 +402,7 @@ class Handler_Public extends Handler {
|
|||
$id = $this->dbh->fetch_result($result, 0, "ref_id");
|
||||
$owner_uid = $this->dbh->fetch_result($result, 0, "owner_uid");
|
||||
|
||||
$article = format_article($id, false, true, $owner_uid);
|
||||
$article = Article::format_article($id, false, true, $owner_uid);
|
||||
|
||||
print_r($article['content']);
|
||||
|
||||
|
|
|
|||
|
|
@ -1136,53 +1136,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
|
||||
|
||||
$a_id = db_escape_string($id);
|
||||
|
||||
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
|
||||
|
||||
$query = "SELECT DISTINCT tag_name,
|
||||
owner_uid as owner FROM
|
||||
ttrss_tags WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
|
||||
ref_id = '$a_id' AND owner_uid = '$owner_uid' LIMIT 1) ORDER BY tag_name";
|
||||
|
||||
$tags = array();
|
||||
|
||||
/* check cache first */
|
||||
|
||||
if ($tag_cache === false) {
|
||||
$result = db_query("SELECT tag_cache FROM ttrss_user_entries
|
||||
WHERE ref_id = '$id' AND owner_uid = $owner_uid");
|
||||
|
||||
if (db_num_rows($result) != 0)
|
||||
$tag_cache = db_fetch_result($result, 0, "tag_cache");
|
||||
}
|
||||
|
||||
if ($tag_cache) {
|
||||
$tags = explode(",", $tag_cache);
|
||||
} else {
|
||||
|
||||
/* do it the hard way */
|
||||
|
||||
$tmp_result = db_query($query);
|
||||
|
||||
while ($tmp_line = db_fetch_assoc($tmp_result)) {
|
||||
array_push($tags, $tmp_line["tag_name"]);
|
||||
}
|
||||
|
||||
/* update the cache */
|
||||
|
||||
$tags_str = db_escape_string(join(",", $tags));
|
||||
|
||||
db_query("UPDATE ttrss_user_entries
|
||||
SET tag_cache = '$tags_str' WHERE ref_id = '$id'
|
||||
AND owner_uid = $owner_uid");
|
||||
}
|
||||
|
||||
return $tags;
|
||||
}
|
||||
|
||||
function trim_array($array) {
|
||||
$tmp = $array;
|
||||
array_walk($tmp, 'trim');
|
||||
|
|
@ -1211,235 +1164,6 @@
|
|||
return vsprintf(__(array_shift($args)), $args);
|
||||
}
|
||||
|
||||
function format_article($id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
|
||||
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
|
||||
|
||||
$rv = array();
|
||||
|
||||
$rv['id'] = $id;
|
||||
|
||||
/* we can figure out feed_id from article id anyway, why do we
|
||||
* pass feed_id here? let's ignore the argument :(*/
|
||||
|
||||
$result = db_query("SELECT feed_id FROM ttrss_user_entries
|
||||
WHERE ref_id = '$id'");
|
||||
|
||||
$feed_id = (int) db_fetch_result($result, 0, "feed_id");
|
||||
|
||||
$rv['feed_id'] = $feed_id;
|
||||
|
||||
//if (!$zoom_mode) { print "<article id='$id'><![CDATA["; };
|
||||
|
||||
if ($mark_as_read) {
|
||||
$result = db_query("UPDATE ttrss_user_entries
|
||||
SET unread = false,last_read = NOW()
|
||||
WHERE ref_id = '$id' AND owner_uid = $owner_uid");
|
||||
|
||||
ccache_update($feed_id, $owner_uid);
|
||||
}
|
||||
|
||||
$result = db_query("SELECT id,title,link,content,feed_id,comments,int_id,lang,
|
||||
".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
|
||||
(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
|
||||
(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
|
||||
(SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images,
|
||||
(SELECT always_display_enclosures FROM ttrss_feeds WHERE id = feed_id) as always_display_enclosures,
|
||||
num_comments,
|
||||
tag_cache,
|
||||
author,
|
||||
guid,
|
||||
orig_feed_id,
|
||||
note
|
||||
FROM ttrss_entries,ttrss_user_entries
|
||||
WHERE id = '$id' AND ref_id = id AND owner_uid = $owner_uid");
|
||||
|
||||
if ($result) {
|
||||
|
||||
$line = db_fetch_assoc($result);
|
||||
|
||||
$line["tags"] = get_article_tags($id, $owner_uid, $line["tag_cache"]);
|
||||
unset($line["tag_cache"]);
|
||||
|
||||
$line["content"] = sanitize($line["content"],
|
||||
sql_bool_to_bool($line['hide_images']),
|
||||
$owner_uid, $line["site_url"], false, $line["id"]);
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
|
||||
$line = $p->hook_render_article($line);
|
||||
}
|
||||
|
||||
$num_comments = (int) $line["num_comments"];
|
||||
$entry_comments = "";
|
||||
|
||||
if ($num_comments > 0) {
|
||||
if ($line["comments"]) {
|
||||
$comments_url = htmlspecialchars($line["comments"]);
|
||||
} else {
|
||||
$comments_url = htmlspecialchars($line["link"]);
|
||||
}
|
||||
$entry_comments = "<a class=\"postComments\"
|
||||
target='_blank' rel=\"noopener noreferrer\" href=\"$comments_url\">$num_comments ".
|
||||
_ngettext("comment", "comments", $num_comments)."</a>";
|
||||
|
||||
} else {
|
||||
if ($line["comments"] && $line["link"] != $line["comments"]) {
|
||||
$entry_comments = "<a class=\"postComments\" target='_blank' rel=\"noopener noreferrer\" href=\"".htmlspecialchars($line["comments"])."\">".__("comments")."</a>";
|
||||
}
|
||||
}
|
||||
|
||||
if ($zoom_mode) {
|
||||
header("Content-Type: text/html");
|
||||
$rv['content'] .= "<html><head>
|
||||
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
|
||||
<title>Tiny Tiny RSS - ".$line["title"]."</title>".
|
||||
stylesheet_tag("css/tt-rss.css").
|
||||
stylesheet_tag("css/zoom.css").
|
||||
stylesheet_tag("css/dijit.css")."
|
||||
|
||||
<link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
|
||||
<link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
|
||||
|
||||
</head><body id=\"ttrssZoom\">";
|
||||
}
|
||||
|
||||
$rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">";
|
||||
|
||||
$rv['content'] .= "<div class=\"postHeader\" id=\"POSTHDR-$id\">";
|
||||
|
||||
$entry_author = $line["author"];
|
||||
|
||||
if ($entry_author) {
|
||||
$entry_author = __(" - ") . $entry_author;
|
||||
}
|
||||
|
||||
$parsed_updated = make_local_datetime($line["updated"], true,
|
||||
$owner_uid, true);
|
||||
|
||||
if (!$zoom_mode)
|
||||
$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
|
||||
|
||||
if ($line["link"]) {
|
||||
$rv['content'] .= "<div class='postTitle'><a target='_blank' rel='noopener noreferrer'
|
||||
title=\"".htmlspecialchars($line['title'])."\"
|
||||
href=\"" .
|
||||
htmlspecialchars($line["link"]) . "\">" .
|
||||
$line["title"] . "</a>" .
|
||||
"<span class='author'>$entry_author</span></div>";
|
||||
} else {
|
||||
$rv['content'] .= "<div class='postTitle'>" . $line["title"] . "$entry_author</div>";
|
||||
}
|
||||
|
||||
if ($zoom_mode) {
|
||||
$feed_title = htmlspecialchars($line["feed_title"]);
|
||||
|
||||
$rv['content'] .= "<div class=\"postFeedTitle\">$feed_title</div>";
|
||||
|
||||
$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
|
||||
}
|
||||
|
||||
$tags_str = format_tags_string($line["tags"], $id);
|
||||
$tags_str_full = join(", ", $line["tags"]);
|
||||
|
||||
if (!$tags_str_full) $tags_str_full = __("no tags");
|
||||
|
||||
if (!$entry_comments) $entry_comments = " "; # placeholder
|
||||
|
||||
$rv['content'] .= "<div class='postTags' style='float : right'>
|
||||
<img src='images/tag.png'
|
||||
class='tagsPic' alt='Tags' title='Tags'> ";
|
||||
|
||||
if (!$zoom_mode) {
|
||||
$rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>
|
||||
<a title=\"".__('Edit tags for this article')."\"
|
||||
href=\"#\" onclick=\"editArticleTags($id, $feed_id)\">(+)</a>";
|
||||
|
||||
$rv['content'] .= "<div dojoType=\"dijit.Tooltip\"
|
||||
id=\"ATSTRTIP-$id\" connectId=\"ATSTR-$id\"
|
||||
position=\"below\">$tags_str_full</div>";
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
|
||||
$rv['content'] .= $p->hook_article_button($line);
|
||||
}
|
||||
|
||||
} else {
|
||||
$tags_str = strip_tags($tags_str);
|
||||
$rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>";
|
||||
}
|
||||
$rv['content'] .= "</div>";
|
||||
$rv['content'] .= "<div clear='both'>";
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
|
||||
$rv['content'] .= $p->hook_article_left_button($line);
|
||||
}
|
||||
|
||||
$rv['content'] .= "$entry_comments</div>";
|
||||
|
||||
if ($line["orig_feed_id"]) {
|
||||
|
||||
$tmp_result = db_query("SELECT * FROM ttrss_archived_feeds
|
||||
WHERE id = ".$line["orig_feed_id"] . " AND owner_uid = " . $_SESSION["uid"]);
|
||||
|
||||
if (db_num_rows($tmp_result) != 0) {
|
||||
|
||||
$rv['content'] .= "<div clear='both'>";
|
||||
$rv['content'] .= __("Originally from:");
|
||||
|
||||
$rv['content'] .= " ";
|
||||
|
||||
$tmp_line = db_fetch_assoc($tmp_result);
|
||||
|
||||
$rv['content'] .= "<a target='_blank' rel='noopener noreferrer'
|
||||
href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
|
||||
$tmp_line['title'] . "</a>";
|
||||
|
||||
$rv['content'] .= " ";
|
||||
|
||||
$rv['content'] .= "<a target='_blank' rel='noopener noreferrer' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
|
||||
$rv['content'] .= "<img title='".__('Feed URL')."' class='tinyFeedIcon' src='images/pub_set.png'></a>";
|
||||
|
||||
$rv['content'] .= "</div>";
|
||||
}
|
||||
}
|
||||
|
||||
$rv['content'] .= "</div>";
|
||||
|
||||
$rv['content'] .= "<div id=\"POSTNOTE-$id\">";
|
||||
if ($line['note']) {
|
||||
$rv['content'] .= format_article_note($id, $line['note'], !$zoom_mode);
|
||||
}
|
||||
$rv['content'] .= "</div>";
|
||||
|
||||
if (!$line['lang']) $line['lang'] = 'en';
|
||||
|
||||
$rv['content'] .= "<div class=\"postContent\" lang=\"".$line['lang']."\">";
|
||||
|
||||
$rv['content'] .= $line["content"];
|
||||
|
||||
if (!$zoom_mode) {
|
||||
$rv['content'] .= format_article_enclosures($id,
|
||||
sql_bool_to_bool($line["always_display_enclosures"]),
|
||||
$line["content"],
|
||||
sql_bool_to_bool($line["hide_images"]));
|
||||
}
|
||||
|
||||
$rv['content'] .= "</div>";
|
||||
|
||||
$rv['content'] .= "</div>";
|
||||
|
||||
}
|
||||
|
||||
if ($zoom_mode) {
|
||||
$rv['content'] .= "
|
||||
<div class='footer'>
|
||||
<button onclick=\"return window.close()\">".
|
||||
__("Close this window")."</button></div>";
|
||||
$rv['content'] .= "</body></html>";
|
||||
}
|
||||
|
||||
return $rv;
|
||||
|
||||
}
|
||||
|
||||
function print_checkpoint($n, $s) {
|
||||
$ts = microtime(true);
|
||||
echo sprintf("<!-- CP[$n] %.4f seconds -->\n", $ts - $s);
|
||||
|
|
@ -1589,52 +1313,6 @@
|
|||
return true;
|
||||
}
|
||||
|
||||
function format_tags_string($tags) {
|
||||
if (!is_array($tags) || count($tags) == 0) {
|
||||
return __("no tags");
|
||||
} else {
|
||||
$maxtags = min(5, count($tags));
|
||||
$tags_str = "";
|
||||
|
||||
for ($i = 0; $i < $maxtags; $i++) {
|
||||
$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);
|
||||
|
||||
if (count($tags) > $maxtags)
|
||||
$tags_str .= ", …";
|
||||
|
||||
return $tags_str;
|
||||
}
|
||||
}
|
||||
|
||||
function format_article_labels($labels) {
|
||||
|
||||
if (!is_array($labels)) return '';
|
||||
|
||||
$labels_str = "";
|
||||
|
||||
foreach ($labels as $l) {
|
||||
$labels_str .= sprintf("<span class='hlLabelRef'
|
||||
style='color : %s; background-color : %s'>%s</span>",
|
||||
$l[2], $l[3], $l[1]);
|
||||
}
|
||||
|
||||
return $labels_str;
|
||||
|
||||
}
|
||||
|
||||
function format_article_note($id, $note, $allow_edit = true) {
|
||||
|
||||
$str = "<div class='articleNote' onclick=\"editArticleNote($id)\">
|
||||
<div class='noteEdit' onclick=\"editArticleNote($id)\">".
|
||||
($allow_edit ? __('(edit note)') : "")."</div>$note</div>";
|
||||
|
||||
return $str;
|
||||
}
|
||||
|
||||
|
||||
function add_feed_category($feed_cat, $parent_cat_id = false) {
|
||||
|
||||
if (!$feed_cat) return false;
|
||||
|
|
@ -1720,29 +1398,6 @@
|
|||
|
||||
}
|
||||
|
||||
function get_article_enclosures($id) {
|
||||
|
||||
$query = "SELECT * FROM ttrss_enclosures
|
||||
WHERE post_id = '$id' AND content_url != ''";
|
||||
|
||||
$rv = array();
|
||||
|
||||
$result = db_query($query);
|
||||
|
||||
if (db_num_rows($result) > 0) {
|
||||
while ($line = db_fetch_assoc($result)) {
|
||||
|
||||
if (file_exists(CACHE_DIR . '/images/' . sha1($line["content_url"]))) {
|
||||
$line["content_url"] = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($line["content_url"]);
|
||||
}
|
||||
|
||||
array_push($rv, $line);
|
||||
}
|
||||
}
|
||||
|
||||
return $rv;
|
||||
}
|
||||
|
||||
/* function save_email_address($email) {
|
||||
// FIXME: implement persistent storage of emails
|
||||
|
||||
|
|
@ -1814,144 +1469,6 @@
|
|||
return is_html(fetch_file_contents($url, false, $login, $pass));
|
||||
}
|
||||
|
||||
function format_article_enclosures($id, $always_display_enclosures,
|
||||
$article_content, $hide_images = false) {
|
||||
|
||||
$result = get_article_enclosures($id);
|
||||
$rv = '';
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ENCLOSURES) as $plugin) {
|
||||
$retval = $plugin->hook_format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images);
|
||||
if (is_array($retval)) {
|
||||
$rv = $retval[0];
|
||||
$result = $retval[1];
|
||||
} else {
|
||||
$rv = $retval;
|
||||
}
|
||||
}
|
||||
unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
|
||||
|
||||
if ($rv === '' && !empty($result)) {
|
||||
$entries_html = array();
|
||||
$entries = array();
|
||||
$entries_inline = array();
|
||||
|
||||
foreach ($result as $line) {
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ENCLOSURE_ENTRY) as $plugin) {
|
||||
$line = $plugin->hook_enclosure_entry($line);
|
||||
}
|
||||
|
||||
$url = $line["content_url"];
|
||||
$ctype = $line["content_type"];
|
||||
$title = $line["title"];
|
||||
$width = $line["width"];
|
||||
$height = $line["height"];
|
||||
|
||||
if (!$ctype) $ctype = __("unknown type");
|
||||
|
||||
//$filename = substr($url, strrpos($url, "/")+1);
|
||||
$filename = basename($url);
|
||||
|
||||
$player = format_inline_player($url, $ctype);
|
||||
|
||||
if ($player) array_push($entries_inline, $player);
|
||||
|
||||
# $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\" rel=\"noopener noreferrer\">" .
|
||||
# $filename . " (" . $ctype . ")" . "</a>";
|
||||
|
||||
$entry = "<div onclick=\"openUrlPopup('".htmlspecialchars($url)."')\"
|
||||
dojoType=\"dijit.MenuItem\">$filename ($ctype)</div>";
|
||||
|
||||
array_push($entries_html, $entry);
|
||||
|
||||
$entry = array();
|
||||
|
||||
$entry["type"] = $ctype;
|
||||
$entry["filename"] = $filename;
|
||||
$entry["url"] = $url;
|
||||
$entry["title"] = $title;
|
||||
$entry["width"] = $width;
|
||||
$entry["height"] = $height;
|
||||
|
||||
array_push($entries, $entry);
|
||||
}
|
||||
|
||||
if ($_SESSION['uid'] && !get_pref("STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
|
||||
if ($always_display_enclosures ||
|
||||
!preg_match("/<img/i", $article_content)) {
|
||||
|
||||
foreach ($entries as $entry) {
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin)
|
||||
$retval = $plugin->hook_render_enclosure($entry, $hide_images);
|
||||
|
||||
|
||||
if ($retval) {
|
||||
$rv .= $retval;
|
||||
} else {
|
||||
|
||||
if (preg_match("/image/", $entry["type"])) {
|
||||
|
||||
if (!$hide_images) {
|
||||
$encsize = '';
|
||||
if ($entry['height'] > 0)
|
||||
$encsize .= ' height="' . intval($entry['height']) . '"';
|
||||
if ($entry['width'] > 0)
|
||||
$encsize .= ' width="' . intval($entry['width']) . '"';
|
||||
$rv .= "<p><img
|
||||
alt=\"".htmlspecialchars($entry["filename"])."\"
|
||||
src=\"" .htmlspecialchars($entry["url"]) . "\"
|
||||
" . $encsize . " /></p>";
|
||||
} else {
|
||||
$rv .= "<p><a target=\"_blank\" rel=\"noopener noreferrer\"
|
||||
href=\"".htmlspecialchars($entry["url"])."\"
|
||||
>" .htmlspecialchars($entry["url"]) . "</a></p>";
|
||||
}
|
||||
|
||||
if ($entry['title']) {
|
||||
$rv.= "<div class=\"enclosure_title\">${entry['title']}</div>";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (count($entries_inline) > 0) {
|
||||
$rv .= "<hr clear='both'/>";
|
||||
foreach ($entries_inline as $entry) { $rv .= $entry; };
|
||||
$rv .= "<hr clear='both'/>";
|
||||
}
|
||||
|
||||
$rv .= "<div class=\"attachments\" dojoType=\"dijit.form.DropDownButton\">".
|
||||
"<span>" . __('Attachments')."</span>";
|
||||
|
||||
$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
|
||||
|
||||
foreach ($entries as $entry) {
|
||||
if ($entry["title"])
|
||||
$title = " — " . truncate_string($entry["title"], 30);
|
||||
else
|
||||
$title = "";
|
||||
|
||||
if ($entry["filename"])
|
||||
$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
|
||||
else
|
||||
$filename = "";
|
||||
|
||||
$rv .= "<div onclick='openUrlPopup(\"".htmlspecialchars($entry["url"])."\")'
|
||||
dojoType=\"dijit.MenuItem\">".$filename . $title."</div>";
|
||||
|
||||
};
|
||||
|
||||
$rv .= "</div>";
|
||||
$rv .= "</div>";
|
||||
}
|
||||
|
||||
return $rv;
|
||||
}
|
||||
|
||||
function getLastArticleId() {
|
||||
$result = db_query("SELECT ref_id AS id FROM ttrss_user_entries
|
||||
WHERE owner_uid = " . $_SESSION["uid"] . " ORDER BY ref_id DESC LIMIT 1");
|
||||
|
|
|
|||
Loading…
Reference in a new issue