$tog_marked_link = "selectionToggleMarked()";\r
$tog_published_link = "selectionTogglePublished()";\r
\r
+ $set_score_link = "setSelectionScore()";\r
+\r
if ($is_cat) $cat_q = "&is_cat=$is_cat";\r
\r
if ($search) {\r
// right part\r
\r
$reply .= "<span class='r'>";\r
+ $reply .= "<span id='feed_title'>";\r
\r
if ($feed_site_url) {\r
$target = "target=\"_blank\"";\r
$reply .= $feed_title;\r
}\r
\r
+ $reply .= "</span>";\r
+\r
$reply .= "\r
<a href=\"#\"\r
title=\"".__("View as RSS feed")."\"\r
onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">\r
- <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/feed-icon-12x12.png\"></a>";\r
+ <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/pub_set.svg\"></a>";\r
\r
$reply .= "</span>";\r
\r
$reply .= "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";\r
\r
$reply .= "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>";\r
+ $reply .= "<option value=\"$set_score_link\">".__('Set score')."</option>";\r
\r
if ($feed_id != "0") {\r
$reply .= "<option value=\"$archive_sel_link\">".__('Archive')."</option>";\r
$next_unread_feed, $offset, $vgr_last_feed = false,\r
$override_order = false, $include_children = false) {\r
\r
+ if (isset($_REQUEST["DevForceUpdate"]))\r
+ header("Content-Type: text/plain");\r
+\r
$disable_cache = false;\r
\r
$reply = array();\r
// Update the feed if required with some basic flood control\r
\r
$result = db_query($this->link,\r
- "SELECT ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated\r
+ "SELECT cache_images,cache_content,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated\r
FROM ttrss_feeds WHERE id = '$feed'");\r
\r
if (db_num_rows($result) != 0) {\r
$last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));\r
- if (time() - $last_updated > 120) {\r
+ $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));\r
+ $cache_content = sql_bool_to_bool(db_fetch_result($result, 0, "cache_content"));\r
+\r
+ if (!$cache_images && !$cache_content && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {\r
include "rssfuncs.php";\r
update_rss_feed($this->link, $feed, true, true);\r
+ } else {\r
+ db_query($this->link, "UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'\r
+ WHERE id = '$feed'");\r
}\r
}\r
}\r
}\r
\r
@$search_mode = db_escape_string($_REQUEST["search_mode"]);\r
- @$match_on = db_escape_string($_REQUEST["match_on"]);\r
-\r
- if (!$match_on) {\r
- $match_on = "both";\r
- }\r
+ $match_on = "both"; // deprecated, TODO: remove\r
\r
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);\r
\r
$feed_title = $qfh_ret[1];\r
$feed_site_url = $qfh_ret[2];\r
$last_error = $qfh_ret[3];\r
+ $cache_content = true;\r
\r
$vgroup_last_feed = $vgr_last_feed;\r
\r
-// if (!$offset) {\r
-\r
- if (db_num_rows($result) > 0) {\r
- $reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,\r
- $feed_title,\r
- $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,\r
- $last_error);\r
- }\r
-// }\r
+ $reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,\r
+ $feed_title,\r
+ $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,\r
+ $last_error);\r
\r
$headlines_count = db_num_rows($result);\r
\r
- if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
+ /* if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
$button_plugins = array();\r
foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {\r
- $pclass = trim("button_${p}");\r
+ $pclass = "button_" . trim($p);\r
\r
if (class_exists($pclass)) {\r
$plugin = new $pclass($link);\r
array_push($button_plugins, $plugin);\r
}\r
}\r
- }\r
+ } */\r
+\r
+ global $pluginhost;\r
\r
if (db_num_rows($result) > 0) {\r
\r
array_push($topmost_article_ids, $id);\r
}\r
\r
- if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {\r
-\r
- $update_pic = "<img id='FUPDPIC-$id' src=\"".\r
- theme_image($this->link, 'images/updated.png')."\"\r
- alt=\"Updated\">";\r
- } else {\r
- $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"\r
- alt=\"Updated\">";\r
- }\r
-\r
- if (sql_bool_to_bool($line["unread"]) &&\r
- time() - strtotime($line["updated_noms"]) < $fresh_intl) {\r
-\r
- $update_pic = "<img id='FUPDPIC-$id' src=\"".\r
- theme_image($this->link, 'images/fresh_sign.png')."\" alt=\"Fresh\">";\r
- }\r
-\r
if ($line["unread"] == "t" || $line["unread"] == "1") {\r
$class .= " Unread";\r
++$num_unread;\r
\r
if ($line["marked"] == "t" || $line["marked"] == "1") {\r
$marked_pic = "<img id=\"FMPIC-$id\"\r
- src=\"".theme_image($this->link, 'images/mark_set.png')."\"\r
+ src=\"".theme_image($this->link, 'images/mark_set.svg')."\"\r
class=\"markedPic\" alt=\"Unstar article\"\r
onclick='javascript:toggleMark($id)'>";\r
} else {\r
$marked_pic = "<img id=\"FMPIC-$id\"\r
- src=\"".theme_image($this->link, 'images/mark_unset.png')."\"\r
+ src=\"".theme_image($this->link, 'images/mark_unset.svg')."\"\r
class=\"markedPic\" alt=\"Star article\"\r
onclick='javascript:toggleMark($id)'>";\r
}\r
\r
if ($line["published"] == "t" || $line["published"] == "1") {\r
$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($this->link,\r
- 'images/pub_set.png')."\"\r
+ 'images/pub_set.svg')."\"\r
class=\"markedPic\"\r
alt=\"Unpublish article\" onclick='javascript:togglePub($id)'>";\r
} else {\r
$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($this->link,\r
- 'images/pub_unset.png')."\"\r
+ 'images/pub_unset.svg')."\"\r
class=\"markedPic\"\r
alt=\"Publish article\" onclick='javascript:togglePub($id)'>";\r
}\r
$score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"\r
onclick=\"adjustArticleScore($id, $score)\" title=\"$score $score_title\">"; */\r
\r
- $score_pic = "<img class='hlScorePic' src=\"$score_pic\"\r
+ $score_pic = "<img class='hlScorePic' score='$score' onclick='changeScore($id, this)' src=\"$score_pic\"\r
title=\"$score\">";\r
\r
if ($score > 500) {\r
if ($has_feed_icon) {\r
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";\r
} else {\r
- $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/feed-icon-12x12.png\" alt=\"\">";\r
+ $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.svg\" alt=\"\">";\r
}\r
\r
if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
\r
$reply['content'] .= "<div class='$class' id='RROW-$id' $label_row_style $mouseover_attrs>";\r
\r
- $reply['content'] .= "<div class='hlUpdPic'>$update_pic</div>";\r
-\r
$reply['content'] .= "<div class='hlLeft'>";\r
\r
- $reply['content'] .= "<input type=\"checkbox\" onclick=\"tSR(this)\"\r
+ $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"\r
+ type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"\r
id=\"RCHK-$id\">";\r
\r
$reply['content'] .= "$marked_pic";\r
\r
$reply['content'] .= "<div>";\r
\r
- $reply['content'] .= "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,\r
- 'RROW-$id')\" id=\"RCHK-$id\"/>";\r
+ $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"\r
+ type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"\r
+ id=\"RCHK-$id\">";\r
\r
$reply['content'] .= "$marked_pic";\r
$reply['content'] .= "$published_pic";\r
title=\"".htmlspecialchars($line["feed_title"])."\"\r
onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";\r
}\r
- $reply['content'] .= "<div class=\"updPic\">$update_pic</div>";\r
$reply['content'] .= "</div>";\r
\r
$reply['content'] .= "</div>";\r
$reply['content'] .= " ";\r
\r
$reply['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";\r
- $reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.png'></a>";\r
+ $reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.svg'></a>";\r
\r
$reply['content'] .= "</div>";\r
}\r
\r
$feed_site_url = $line["site_url"];\r
\r
+ if ($cache_content && $line["cached_content"] != "") {\r
+ $line["content_preview"] =& $line["cached_content"];\r
+ }\r
+\r
$article_content = sanitize($this->link, $line["content_preview"],\r
false, false, $feed_site_url);\r
\r
$reply['content'] .= "</div>";\r
\r
$reply['content'] .= "<span id=\"CWRAP-$id\">";\r
- $reply['content'] .= $expand_cdm ? $article_content : '';\r
+ $reply['content'] .= $article_content;\r
$reply['content'] .= "</span>";\r
\r
/* $tmp_result = db_query($this->link, "SELECT always_display_enclosures FROM\r
\r
//$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);\r
\r
- foreach ($button_plugins as $p) {\r
- $reply['content'] .= $p->render($id, $line);\r
+ foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_BUTTON) as $p) {\r
+ $reply['content'] .= $p->hook_article_button($line);\r
}\r
\r
- $reply['content'] .= "<img src=\"images/digest_checkbox.png\"\r
+ $reply['content'] .= "<img src=\"images/close_article.png\"\r
style=\"cursor : pointer\" style=\"cursor : pointer\"\r
onclick=\"dismissArticle($id)\"\r
title='".__('Close article')."'>";\r
* when there's nothing to load - e.g. no stuff in fresh feed */\r
\r
if ($feed == -5) {\r
- print json_encode(generate_dashboard_feed($this->link));\r
+ print json_encode($this->generate_dashboard_feed($this->link));\r
return;\r
}\r
\r
}\r
\r
if ($result && db_num_rows($result) == 0) {\r
- print json_encode(generate_error_feed($this->link, __("Feed not found.")));\r
+ print json_encode($this->generate_error_feed($this->link, __("Feed not found.")));\r
return;\r
}\r
\r
print json_encode($reply);\r
\r
}\r
+\r
+ private function generate_dashboard_feed($link) {\r
+ $reply = array();\r
+\r
+ $reply['headlines']['id'] = -5;\r
+ $reply['headlines']['is_cat'] = false;\r
+\r
+ $reply['headlines']['toolbar'] = '';\r
+ $reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');\r
+\r
+ $reply['headlines']['content'] .= "<p class=\"small\"><span class=\"insensitive\">";\r
+\r
+ $result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds\r
+ WHERE owner_uid = " . $_SESSION['uid']);\r
+\r
+ $last_updated = db_fetch_result($result, 0, "last_updated");\r
+ $last_updated = make_local_datetime($link, $last_updated, false);\r
+\r
+ $reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);\r
+\r
+ $result = db_query($link, "SELECT COUNT(id) AS num_errors\r
+ FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);\r
+\r
+ $num_errors = db_fetch_result($result, 0, "num_errors");\r
+\r
+ if ($num_errors > 0) {\r
+ $reply['headlines']['content'] .= "<br/>";\r
+ $reply['headlines']['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".\r
+ __('Some feeds have update errors (click for details)')."</a>";\r
+ }\r
+ $reply['headlines']['content'] .= "</span></p>";\r
+\r
+ $reply['headlines-info'] = array("count" => 0,\r
+ "vgroup_last_feed" => '',\r
+ "unread" => 0,\r
+ "disable_cache" => true);\r
+\r
+ return $reply;\r
+ }\r
+\r
+ private function generate_error_feed($link, $error) {\r
+ $reply = array();\r
+\r
+ $reply['headlines']['id'] = -6;\r
+ $reply['headlines']['is_cat'] = false;\r
+\r
+ $reply['headlines']['toolbar'] = '';\r
+ $reply['headlines']['content'] = "<div class='whiteBox'>". $error . "</div>";\r
+\r
+ $reply['headlines-info'] = array("count" => 0,\r
+ "vgroup_last_feed" => '',\r
+ "unread" => 0,\r
+ "disable_cache" => true);\r
+\r
+ return $reply;\r
+ }\r
+\r
+\r
}\r
?>\r
git.wh0rd.org / tt-rss.git / blobdiff