From 7e5f8d9fb323dc5e47f545984c6f9b3d320a2912 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 May 2017 14:38:45 +0300 Subject: [PATCH] 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) { --- classes/api.php | 4 +- classes/article.php | 497 ++++++++++++++++++++++++++++++++++++- classes/feeds.php | 8 +- classes/handler/public.php | 8 +- include/functions2.php | 483 ----------------------------------- 5 files changed, 499 insertions(+), 501 deletions(-) diff --git a/classes/api.php b/classes/api.php index 2f1a563c0..65bca190d 100644 --- a/classes/api.php +++ b/classes/api.php @@ -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) diff --git a/classes/article.php b/classes/article.php index b842ea40b..e0c8d3e6d 100644 --- a/classes/article.php +++ b/classes/article.php @@ -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 ''; } - $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 .= " " . +# $filename . " (" . $ctype . ")" . ""; + + $entry = "
$filename ($ctype)
"; + + 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("/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 .= "

\"".htmlspecialchars($entry["filename"])."\"

"; + } else { + $rv .= "

" .htmlspecialchars($entry["url"]) . "

"; + } + + if ($entry['title']) { + $rv.= "
${entry['title']}
"; + } + } + } + } + } + } + + if (count($entries_inline) > 0) { + $rv .= "
"; + foreach ($entries_inline as $entry) { $rv .= $entry; }; + $rv .= "
"; + } + + $rv .= "
". + "" . __('Attachments').""; + + $rv .= "
"; + + 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 .= "
".$filename . $title."
"; + + }; + + $rv .= "
"; + $rv .= "
"; + } + + 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 "
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 = "$num_comments ". + _ngettext("comment", "comments", $num_comments).""; + + } else { + if ($line["comments"] && $line["link"] != $line["comments"]) { + $entry_comments = "".__("comments").""; + } + } + + if ($zoom_mode) { + header("Content-Type: text/html"); + $rv['content'] .= " + + Tiny Tiny RSS - ".$line["title"]."". + stylesheet_tag("css/tt-rss.css"). + stylesheet_tag("css/zoom.css"). + stylesheet_tag("css/dijit.css")." + + + + + "; + } + + $rv['content'] .= "
"; + + $rv['content'] .= "
"; + + $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'] .= "
$parsed_updated
"; + + if ($line["link"]) { + $rv['content'] .= "
" . + $line["title"] . "" . + "$entry_author
"; + } else { + $rv['content'] .= "
" . $line["title"] . "$entry_author
"; + } + + if ($zoom_mode) { + $feed_title = htmlspecialchars($line["feed_title"]); + + $rv['content'] .= "
$feed_title
"; + + $rv['content'] .= "
$parsed_updated
"; + } + + $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'] .= "
+ Tags "; + + if (!$zoom_mode) { + $rv['content'] .= "$tags_str + (+)"; + + $rv['content'] .= "
$tags_str_full
"; + + 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'] .= "$tags_str"; + } + $rv['content'] .= "
"; + $rv['content'] .= "
"; + + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) { + $rv['content'] .= $p->hook_article_left_button($line); + } + + $rv['content'] .= "$entry_comments
"; + + 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'] .= "
"; + $rv['content'] .= __("Originally from:"); + + $rv['content'] .= " "; + + $tmp_line = db_fetch_assoc($tmp_result); + + $rv['content'] .= "" . + $tmp_line['title'] . ""; + + $rv['content'] .= " "; + + $rv['content'] .= ""; + $rv['content'] .= ""; + + $rv['content'] .= "
"; + } + } + + $rv['content'] .= "
"; + + $rv['content'] .= "
"; + if ($line['note']) { + $rv['content'] .= Article::format_article_note($id, $line['note'], !$zoom_mode); + } + $rv['content'] .= "
"; + + if (!$line['lang']) $line['lang'] = 'en'; + + $rv['content'] .= "
"; + + $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'] .= "
"; + + $rv['content'] .= "
"; + + } + + if ($zoom_mode) { + $rv['content'] .= " +
+
"; + $rv['content'] .= ""; + } + + 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 .= "" . $tags[$i] . ", "; + } + + $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("%s", + $l[2], $l[3], $l[1]); + } + + return $labels_str; + + } + + static function format_article_note($id, $note, $allow_edit = true) { + + $str = "
+
". + ($allow_edit ? __('(edit note)') : "")."
$note
"; + + 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; + } } diff --git a/classes/feeds.php b/classes/feeds.php index 4d4707a94..d0ab09731 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -361,7 +361,7 @@ class Feeds extends Handler_Protected { if (!is_array($labels)) $labels = get_article_labels($id); $labels_str = ""; - $labels_str .= format_article_labels($labels); + $labels_str .= Article::format_article_labels($labels); $labels_str .= ""; if (count($topmost_article_ids) < 3) { @@ -672,7 +672,7 @@ class Feeds extends Handler_Protected { $reply['content'] .= "
"; if ($line['note']) { - $reply['content'] .= format_article_note($id, $line['note']); + $reply['content'] .= Article::format_article_note($id, $line['note']); } $reply['content'] .= "
"; @@ -720,7 +720,7 @@ class Feeds extends Handler_Protected { $reply['content'] .= "
"; $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'] .= "
"; @@ -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'] .= ""; diff --git a/classes/handler/public.php b/classes/handler/public.php index a6bc3ff6f..183a7d3ba 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -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']); diff --git a/include/functions2.php b/include/functions2.php index e92202350..b8900e78b 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -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 "
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 = "$num_comments ". - _ngettext("comment", "comments", $num_comments).""; - - } else { - if ($line["comments"] && $line["link"] != $line["comments"]) { - $entry_comments = "".__("comments").""; - } - } - - if ($zoom_mode) { - header("Content-Type: text/html"); - $rv['content'] .= " - - Tiny Tiny RSS - ".$line["title"]."". - stylesheet_tag("css/tt-rss.css"). - stylesheet_tag("css/zoom.css"). - stylesheet_tag("css/dijit.css")." - - - - - "; - } - - $rv['content'] .= "
"; - - $rv['content'] .= "
"; - - $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'] .= "
$parsed_updated
"; - - if ($line["link"]) { - $rv['content'] .= "
" . - $line["title"] . "" . - "$entry_author
"; - } else { - $rv['content'] .= "
" . $line["title"] . "$entry_author
"; - } - - if ($zoom_mode) { - $feed_title = htmlspecialchars($line["feed_title"]); - - $rv['content'] .= "
$feed_title
"; - - $rv['content'] .= "
$parsed_updated
"; - } - - $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'] .= "
- Tags "; - - if (!$zoom_mode) { - $rv['content'] .= "$tags_str - (+)"; - - $rv['content'] .= "
$tags_str_full
"; - - 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'] .= "$tags_str"; - } - $rv['content'] .= "
"; - $rv['content'] .= "
"; - - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) { - $rv['content'] .= $p->hook_article_left_button($line); - } - - $rv['content'] .= "$entry_comments
"; - - 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'] .= "
"; - $rv['content'] .= __("Originally from:"); - - $rv['content'] .= " "; - - $tmp_line = db_fetch_assoc($tmp_result); - - $rv['content'] .= "" . - $tmp_line['title'] . ""; - - $rv['content'] .= " "; - - $rv['content'] .= ""; - $rv['content'] .= ""; - - $rv['content'] .= "
"; - } - } - - $rv['content'] .= "
"; - - $rv['content'] .= "
"; - if ($line['note']) { - $rv['content'] .= format_article_note($id, $line['note'], !$zoom_mode); - } - $rv['content'] .= "
"; - - if (!$line['lang']) $line['lang'] = 'en'; - - $rv['content'] .= "
"; - - $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'] .= "
"; - - $rv['content'] .= "
"; - - } - - if ($zoom_mode) { - $rv['content'] .= " -
-
"; - $rv['content'] .= ""; - } - - return $rv; - - } - function print_checkpoint($n, $s) { $ts = microtime(true); echo sprintf("\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 .= "" . $tags[$i] . ", "; - } - - $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("%s", - $l[2], $l[3], $l[1]); - } - - return $labels_str; - - } - - function format_article_note($id, $note, $allow_edit = true) { - - $str = "
-
". - ($allow_edit ? __('(edit note)') : "")."
$note
"; - - 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 .= " " . -# $filename . " (" . $ctype . ")" . ""; - - $entry = "
$filename ($ctype)
"; - - 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("/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 .= "

\"".htmlspecialchars($entry["filename"])."\"

"; - } else { - $rv .= "

" .htmlspecialchars($entry["url"]) . "

"; - } - - if ($entry['title']) { - $rv.= "
${entry['title']}
"; - } - } - } - } - } - } - - if (count($entries_inline) > 0) { - $rv .= "
"; - foreach ($entries_inline as $entry) { $rv .= $entry; }; - $rv .= "
"; - } - - $rv .= "
". - "" . __('Attachments').""; - - $rv .= "
"; - - 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 .= "
".$filename . $title."
"; - - }; - - $rv .= "
"; - $rv .= "
"; - } - - 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");