move the following to Article:

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

diff --git a/classes/feeds.php b/classes/feeds.php
index 6b96d8364d914c13f6e31e31009f31869c86b64a..d0ab09731058041dfbfc06aae800274b2a8b93fd 100755 (executable)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -13,7 +13,7 @@ class Feeds extends Handler_Protected {
 
        private function format_headline_subtoolbar($feed_site_url, $feed_title,
                        $feed_id, $is_cat, $search,
-                       $view_mode, $error, $feed_last_updated) {
+                       $error, $feed_last_updated) {
 
                $catchup_sel_link = "catchupSelection()";
 
@@ -153,7 +153,7 @@ class Feeds extends Handler_Protected {
        }
 
        private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
-                                       $next_unread_feed, $offset, $vgr_last_feed = false,
+                                       $offset, $vgr_last_feed = false,
                                        $override_order = false, $include_children = false, $check_first_id = false,
                                        $skip_first_id_check = false) {
 
@@ -203,7 +203,7 @@ class Feeds extends Handler_Protected {
 
                                        if (!$cache_images && time() - $last_updated > 120) {
                                                include "rssfuncs.php";
-                                               update_rss_feed($feed, true, true);
+                                               update_rss_feed($feed, true);
                                        } else {
                                                $this->dbh->query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
                                                                WHERE id = '$feed'");
@@ -300,12 +300,13 @@ class Feeds extends Handler_Protected {
                        make_local_datetime($qfh_ret[4], false) : __("Never");
                $highlight_words = $qfh_ret[5];
                $reply['first_id'] = $qfh_ret[6];
+               $reply['search_query'] = [$search, $search_language];
 
                $vgroup_last_feed = $vgr_last_feed;
 
                $reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,
                        $feed_title,
-                       $feed, $cat_view, $search, $view_mode,
+                       $feed, $cat_view, $search,
                        $last_error, $last_updated);
 
                $headlines_count = is_numeric($result) ? 0 : $this->dbh->num_rows($result);
@@ -360,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, $id);
+                               $labels_str .= Article::format_article_labels($labels);
                                $labels_str .= "</span>";
 
                                if (count($topmost_article_ids) < 3) {
@@ -484,7 +485,7 @@ class Feeds extends Handler_Protected {
                                        $mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
                                                onmouseout='postMouseOut($id)'";
 
-                                       $reply['content'] .= "<div class='hl $class' data-orig-feed-id='$feed_id' data-article-id='$id' id='RROW-$id' $mouseover_attrs>";
+                                       $reply['content'] .= "<div class='hl hlMenuAttach $class' data-orig-feed-id='$feed_id' data-article-id='$id' id='RROW-$id' $mouseover_attrs>";
 
                                        $reply['content'] .= "<div class='hlLeft'>";
 
@@ -611,9 +612,11 @@ class Feeds extends Handler_Protected {
                                                }
                                        }
 
+                                       // data-article-id included for context menu
                                        $reply['content'] .= "<span id=\"RTITLE-$id\"
                                                onclick=\"return cdmClicked(event, $id);\"
-                                               class=\"titleWrap $hlc_suffix\">
+                                               data-article-id=\"$id\"
+                                               class=\"titleWrap hlMenuAttach $hlc_suffix\">                                           
                                                <a class=\"title $hlc_suffix\"
                                                title=\"".htmlspecialchars($line["title"])."\"
                                                target=\"_blank\" rel=\"noopener noreferrer\" href=\"".
@@ -664,12 +667,12 @@ class Feeds extends Handler_Protected {
                                        $reply['content'] .= "</div>";
 
                                        $reply['content'] .= "<div class=\"cdmContent\" $content_hidden
-                                               onclick=\"return cdmClicked(event, $id);\"
+                                               onclick=\"return cdmClicked(event, $id, true);\"
                                                id=\"CICD-$id\">";
 
                                        $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>";
 
@@ -717,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>";
 
@@ -727,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'>";
 
@@ -934,7 +937,7 @@ class Feeds extends Handler_Protected {
                if ($_REQUEST["debug"]) $timing_info = print_checkpoint("04", $timing_info);
 
                $ret = $this->format_headlines_list($feed, $method,
-                       $view_mode, $limit, $cat_view, $next_unread_feed, $offset,
+                       $view_mode, $limit, $cat_view, $offset,
                        $vgroup_last_feed, $override_order, true, $check_first_id, $skip_first_id_check);
 
                //$topmost_article_ids = $ret[0];
@@ -1228,7 +1231,7 @@ class Feeds extends Handler_Protected {
 
                if ($do_update) {
                        include "rssfuncs.php";
-                       update_rss_feed($feed_id, true, true);
+                       update_rss_feed($feed_id, true);
                }
 
                ?></pre>
@@ -1238,5 +1241,7 @@ class Feeds extends Handler_Protected {
                <?php
 
        }
+
+
 }
 ?>