implement mail plugin using mailto: links; deprecate mail plugin

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

diff --git a/classes/feeds.php b/classes/feeds.php
index b57f66a6fdb0c340f567c0dc5e4770237aefffd2..5fa51768c5027761bd50600a7db99b28ffe8e39c 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -126,6 +126,11 @@ class Feeds extends Handler_Protected {
                                "</option>";
                }
 
+               if ($pluginhost->get_plugin("mailto")) {
+                       $reply .= "<option value=\"mailtoArticle(false)\">".__('Forward by email').
+                               "</option>";
+               }
+
                $reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
 
                $reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
@@ -165,15 +170,14 @@ class Feeds extends Handler_Protected {
                        // Update the feed if required with some basic flood control
 
                        $result = db_query($this->link,
-                               "SELECT cache_images,cache_content,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+                               "SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
                                        FROM ttrss_feeds WHERE id = '$feed'");
 
                                if (db_num_rows($result) != 0) {
                                        $last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));
                                        $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
-                                       $cache_content = sql_bool_to_bool(db_fetch_result($result, 0, "cache_content"));
 
-                                       if (!$cache_images && !$cache_content && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {
+                                       if (!$cache_images && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {
                                                include "rssfuncs.php";
                                                update_rss_feed($this->link, $feed, true, true);
                                        } else {
@@ -224,7 +228,6 @@ class Feeds extends Handler_Protected {
                $feed_title = $qfh_ret[1];
                $feed_site_url = $qfh_ret[2];
                $last_error = $qfh_ret[3];
-               $cache_content = true;
 
                $vgroup_last_feed = $vgr_last_feed;
 
@@ -390,6 +393,8 @@ class Feeds extends Handler_Protected {
                                        $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.svg\" alt=\"\">";
                                }
 
+                               $entry_site_url = $line["site_url"];
+
                                if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
 
                                        if (get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
@@ -443,19 +448,18 @@ class Feeds extends Handler_Protected {
 
                                        $reply['content'] .= $labels_str;
 
-                                       if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED') &&
-                                               defined('_SHOW_FEED_TITLE_IN_VFEEDS')) {
-                                               if (@$line["feed_title"]) {
-                                                       $reply['content'] .= "<span class=\"hlFeed\">
-                                                               (<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
-                                                               $line["feed_title"]."</a>)
-                                                       </span>";
-                                               }
-                                       }
-
                                        $reply['content'] .= "</div>";
 
-                                       $reply['content'] .= "<span class=\"hlUpdated\">$updated_fmt</span>";
+                                       $reply['content'] .= "<span class=\"hlUpdated\">";
+
+                                       if (@$line["feed_title"]) {
+                                                       $reply['content'] .= "<div class=\"hlFeed\">
+                                                               <a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+                                                               $line["feed_title"]."</a>
+                                                       </div>";
+                                               }
+
+                                       $reply['content'] .= "$updated_fmt</span>";
                                        $reply['content'] .= "<div class=\"hlRight\">";
 
                                        $reply['content'] .= $score_pic;
@@ -477,7 +481,7 @@ class Feeds extends Handler_Protected {
                                        unset($line["tag_cache"]);
 
                                        $line["content"] = sanitize($this->link, $line["content_preview"],
-                                                       false, false, $feed_site_url);
+                                                       false, false, $entry_site_url);
 
                                        foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_CDM) as $p) {
                                                $line = $p->hook_render_article_cdm($line);
@@ -513,12 +517,12 @@ class Feeds extends Handler_Protected {
                                        $mouseover_attrs = "onmouseover='postMouseIn($id)'
                                                onmouseout='postMouseOut($id)'";
 
-                                       $reply['content'] .= "<div class=\"$class\" $label_row_style
+                                       $reply['content'] .= "<div class=\"cdm $class\"
                                                id=\"RROW-$id\" $mouseover_attrs'>";
 
                                        $reply['content'] .= "<div class=\"cdmHeader\">";
 
-                                       $reply['content'] .= "<div>";
+                                       $reply['content'] .= "<div style=\"vertical-align : middle\">";
 
                                        $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
                                                        type=\"checkbox\" onclick=\"toggleSelectRow2(this, false, true)\"
@@ -540,20 +544,10 @@ class Feeds extends Handler_Protected {
                                                target=\"_blank\" href=\"".
                                                htmlspecialchars($line["link"])."\">".
                                                $line["title"] .
-                                               " $entry_author</a>";
+                                               " <span class=\"author\">$entry_author</span></a>";
 
                                        $reply['content'] .= $labels_str;
 
-                                       if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED') &&
-                                               defined('_SHOW_FEED_TITLE_IN_VFEEDS')) {
-                                               if (@$line["feed_title"]) {
-                                                       $reply['content'] .= "<span class=\"hlFeed\">
-                                                               (<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
-                                                               $line["feed_title"]."</a>)
-                                                       </span>";
-                                               }
-                                       }
-
                                        if (!$expand_cdm)
                                                $content_hidden = "style=\"display : none\"";
                                        else
@@ -564,8 +558,18 @@ class Feeds extends Handler_Protected {
 
                                        $reply['content'] .= "</span>";
 
-                                       $reply['content'] .= "<div>";
+                                       if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
+                                               if (@$line["feed_title"]) {
+                                                       $reply['content'] .= "<div class=\"hlFeed\">
+                                                               <a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+                                                               $line["feed_title"]."</a>
+                                                       </div>";
+                                               }
+                                       }
+
                                        $reply['content'] .= "<span class='updated'>$updated_fmt</span>";
+
+                                       $reply['content'] .= "<div style=\"vertical-align : middle\">";
                                        $reply['content'] .= "$score_pic";
 
                                        if (!get_pref($this->link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
@@ -617,12 +621,6 @@ class Feeds extends Handler_Protected {
                                                }
                                        }
 
-                                       $feed_site_url = $line["site_url"];
-
-                                       if ($cache_content && $line["cached_content"] != "") {
-                                               $line["content_preview"] =& $line["cached_content"];
-                                       }
-
                                        $reply['content'] .= "<span id=\"CWRAP-$id\">";
                                        $reply['content'] .= $line["content"];
                                        $reply['content'] .= "</span>";