<?php
date_default_timezone_set('UTC');
- error_reporting(E_ALL & ~E_NOTICE);
+ if (defined('E_DEPRECATED')) {
+ error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+ } else {
+ error_reporting(E_ALL & ~E_NOTICE);
+ }
require_once 'config.php';
*/
function get_favicon_url($url) {
+ $favicon_url = false;
+
if ($html = @fetch_file_contents($url)) {
- if ( preg_match('/<link[^>]+rel="(?:shortcut )?icon"[^>]+?href="([^"]+?)"/si', $html, $matches)) {
- // Attempt to grab a favicon link from their webpage url
- $linkUrl = html_entity_decode($matches[1]);
+ libxml_use_internal_errors(true);
- if (substr($linkUrl, 0, 1) == '/') {
- $urlParts = parse_url($url);
- $faviconURL = $urlParts['scheme'].'://'.$urlParts['host'].$linkUrl;
- } else if (substr($linkUrl, 0, 7) == 'http://') {
- $faviconURL = $linkUrl;
- } else {
- $pos = strrpos($url, "/");
- // no "/" in url or "/" is part of "://"
- if ($pos === false || $pos == (strpos($url, "://")+2)) {
- $faviconURL = $url.'/'.$linkUrl;
- } else {
- $faviconURL = substr($url, 0, $pos+1).$linkUrl;
- }
- }
+ $doc = new DOMDocument();
+ $doc->loadHTML($html);
+ $xpath = new DOMXPath($doc);
+ $entries = $xpath->query('/html/head/link[@rel="shortcut icon"]');
- } else {
- // If unsuccessful, attempt to "guess" the favicon location
- $urlParts = parse_url($url);
- $faviconURL = $urlParts['scheme'].'://'.$urlParts['host'].'/favicon.ico';
- }
+ if (count($entries) > 0) {
+ foreach ($entries as $entry) {
+ $favicon_url = rewrite_relative_url($url, $entry->getAttribute("href"));
+ break;
+ }
+ }
}
+ if (!$favicon_url)
+ $favicon_url = rewrite_relative_url($url, "/favicon.ico");
+
// Run a test to see if what we have attempted to get actually exists.
- if(USE_CURL_FOR_ICONS || url_validate($faviconURL)) {
- return $faviconURL;
+ if(USE_CURL_FOR_ICONS || url_validate($favicon_url)) {
+ return $favicon_url;
} else {
return false;
}
// print "I: " . $rss->channel["image"]["url"];
if (!$use_simplepie) {
- $icon_url = $rss->image["url"];
+ $icon_url = db_escape_string($rss->image["url"]);
} else {
- $icon_url = $rss->get_image_url();
+ $icon_url = db_escape_string($rss->get_image_url());
}
- if ($icon_url && !$orig_icon_url != db_escape_string($icon_url)) {
- $icon_url = db_escape_string($icon_url);
- db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
+ if ($icon_url && $orig_icon_url != $icon_url) {
+ if (USE_CURL_FOR_ICONS || url_validate($icon_url)) {
+ db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
+ }
}
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
foreach ($filters["title"] as $filter) {
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && preg_match("/$reg_exp/i", $title)) ||
- ($inverse && !preg_match("/$reg_exp/i", $title))) {
+ if ((!$inverse && @preg_match("/$reg_exp/i", $title)) ||
+ ($inverse && !@preg_match("/$reg_exp/i", $title))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && preg_match("/$reg_exp/i", $content)) ||
- ($inverse && !preg_match("/$reg_exp/i", $content))) {
+ if ((!$inverse && @preg_match("/$reg_exp/i", $content)) ||
+ ($inverse && !@preg_match("/$reg_exp/i", $content))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
$inverse = $filter["inverse"];
if ($inverse) {
- if (!preg_match("/$reg_exp/i", $title) && !preg_match("/$reg_exp/i", $content)) {
+ if (!@preg_match("/$reg_exp/i", $title) && !preg_match("/$reg_exp/i", $content)) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
} else {
- if (preg_match("/$reg_exp/i", $title) || preg_match("/$reg_exp/i", $content)) {
+ if (@preg_match("/$reg_exp/i", $title) || preg_match("/$reg_exp/i", $content)) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
}
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && preg_match("/$reg_exp/i", $link)) ||
- ($inverse && !preg_match("/$reg_exp/i", $link))) {
+ if ((!$inverse && @preg_match("/$reg_exp/i", $link)) ||
+ ($inverse && !@preg_match("/$reg_exp/i", $link))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
foreach ($filters["author"] as $filter) {
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && preg_match("/$reg_exp/i", $author)) ||
- ($inverse && !preg_match("/$reg_exp/i", $author))) {
+ if ((!$inverse && @preg_match("/$reg_exp/i", $author)) ||
+ ($inverse && !@preg_match("/$reg_exp/i", $author))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && preg_match("/$reg_exp/i", $tag_string)) ||
- ($inverse && !preg_match("/$reg_exp/i", $tag_string))) {
+ if ((!$inverse && @preg_match("/$reg_exp/i", $tag_string)) ||
+ ($inverse && !@preg_match("/$reg_exp/i", $tag_string))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
}
}
- function catchup_feed($link, $feed, $cat_view, $owner_uid) {
+ function catchup_feed($link, $feed, $cat_view, $owner_uid = false) {
if (!$owner_uid) $owner_uid = $_SESSION['uid'];
$data = array();
$data['num_feeds'] = (int) $num_feeds;
+ $data['last_article_id'] = getLastArticleId($link);
+ $data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED');
if (ENABLE_UPDATE_DAEMON) {
} */
- function sanitize_rss($link, $str, $force_strip_tags = false, $owner = false) {
- $res = $str;
+ function sanitize_rss($link, $str, $force_strip_tags = false, $owner = false, $site_url = false) {
if (!$owner) $owner = $_SESSION["uid"];
+ $res = trim($str); if (!$res) return '';
+
if (get_pref($link, "STRIP_UNSAFE_TAGS", $owner) || $force_strip_tags) {
// $res = strip_tags_long($res,
$res = preg_replace('/<img[^>]+>/is', '', $res);
}
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
- $res = preg_replace("/href=/i", "target=\"_blank\" href=", $res);
+ $charset_hack = '<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ </head>';
+
+ $res = trim($res); if (!$res) return '';
+
+ libxml_use_internal_errors(true);
+
+ $doc = new DOMDocument();
+ $doc->loadHTML($charset_hack . $res);
+ $xpath = new DOMXPath($doc);
+
+ $entries = $xpath->query('(//a[@href]|//img[@src])');
+
+ foreach ($entries as $entry) {
+
+ if ($site_url) {
+
+ if ($entry->hasAttribute('href'))
+ $entry->setAttribute('href',
+ rewrite_relative_url($site_url, $entry->getAttribute('href')));
+
+ if ($entry->hasAttribute('src'))
+ $entry->setAttribute('src',
+ rewrite_relative_url($site_url, $entry->getAttribute('src')));
+ }
+
+ if (strtolower($entry->nodeName) == "a") {
+ if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
+ $entry->setAttribute("target", "_blank");
+ }
+ }
+
+ if (strtolower($entry->nodeName) == "img") {
+ $br = $doc->createElement("br");
+
+ if ($entry->parentNode->nextSibling)
+ $entry->parentNode->insertBefore($br, $entry->nextSibling);
+
+ }
}
+
+ $node = $doc->getElementsByTagName('body')->item(0);
- return $res;
+ return $doc->saveXML($node);
}
/**
$archive_sel_link = "javascript:archiveSelection()";
$delete_sel_link = "javascript:deleteSelection()";
- if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
-
- $sel_all_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)";
- $sel_unread_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)";
- $sel_none_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)";
- $sel_inv_link = "javascript:invertHeadlineSelection()";
-
- $tog_unread_link = "javascript:selectionToggleUnread()";
- $tog_marked_link = "javascript:selectionToggleMarked()";
- $tog_published_link = "javascript:selectionTogglePublished()";
-
- } else {
+ $sel_all_link = "javascript:selectArticles('all')";
+ $sel_unread_link = "javascript:selectArticles('unread')";
+ $sel_none_link = "javascript:selectArticles('none')";
+ $sel_inv_link = "javascript:selectArticles('invert')";
- $sel_all_link = "javascript:cdmSelectArticles('all')";
- $sel_unread_link = "javascript:cdmSelectArticles('unread')";
- $sel_none_link = "javascript:cdmSelectArticles('none')";
-
- $sel_inv_link = "javascript:invertHeadlineSelection()";
-
- $tog_unread_link = "javascript:selectionToggleUnread()";
- $tog_marked_link = "javascript:selectionToggleMarked()";
- $tog_published_link = "javascript:selectionTogglePublished()";
-
- }
+ $tog_unread_link = "javascript:selectionToggleUnread()";
+ $tog_marked_link = "javascript:selectionToggleMarked()";
+ $tog_published_link = "javascript:selectionTogglePublished()";
print "<div id=\"subtoolbar_ftitle\">";
if ($feed_site_url) {
$target = "target=\"_blank\"";
- print "<a title=\"".__("Visit the website")."\"$target href=\"$feed_site_url\">".
+ print "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
truncate_string($feed_title,30)."</a>";
} else {
if ($feed_id < -10) {
print "</div>";
print __('Select:')."
- <a href=\"$sel_all_link\">".__('All')."</a>,
- <a href=\"$sel_unread_link\">".__('Unread')."</a>,
- <a href=\"$sel_inv_link\">".__('Invert')."</a>,
- <a href=\"$sel_none_link\">".__('None')."</a></li>";
+ <a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,
+ <a href=\"#\" onclick=\"$sel_unread_link\">".__('Unread')."</a>,
+ <a href=\"#\" onclick=\"$sel_inv_link\">".__('Invert')."</a>,
+ <a href=\"#\" onclick=\"$sel_none_link\">".__('None')."</a></li>";
print " ";
$result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
+ (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
num_comments,
author,
orig_feed_id,
$feed_icon = " ";
}
+ $feed_site_url = $line['site_url'];
+
$num_comments = $line["num_comments"];
$entry_comments = "";
print "</div>";
- print "<div class=\"postIcon\">" . $feed_icon . "</div>";
+ print "<div class=\"postIcon\">" .
+ "<a target=\"_blank\" title=\"".__("Visit the website")."\"$
+ href=\"".htmlspecialchars($feed_site_url)."\">".
+ $feed_icon . "</a></div>";
print "<div class=\"postContent\">";
- $article_content = sanitize_rss($link, $line["content"]);
+ $article_content = sanitize_rss($link, $line["content"], false, false,
+ $feed_site_url);
print "<div id=\"POSTNOTE-$id\">";
if ($line['note']) {
print "<td class='hlMarkedPic'>$marked_pic</td>";
print "<td class='hlMarkedPic'>$published_pic</td>";
-# if ($line["feed_title"]) {
-# print "<td class='hlContent'>$content_link</td>";
-# print "<td class='hlFeed'>
-# <a href=\"javascript:viewfeed($feed_id, '', false)\">".
-# truncate_string($line["feed_title"],30)."</a> </td>";
-# } else {
-
- print "<td onclick='view($id)' class='hlContent$hlc_suffix' valign='middle' id='HLC-$id'>";
+ print "<td onclick='return hlClicked(event,$id)'
+ class='hlContent$hlc_suffix' valign='middle' id='HLC-$id'>";
print "<a id=\"RTITLE-$id\"
href=\"" . htmlspecialchars($line["link"]) . "\"
print $labels_str;
-# <a href=\"javascript:viewfeed($feed_id, '', false)\">".
-# $line["feed_title"]."</a>
-
if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
if (@$line["feed_title"]) {
print "<span class=\"hlFeed\">
}
}
-// print "<img id='HLL-$id' class='hlLoading'
-// src='images/indicator_tiny.gif' style='display : none'>";
-
print "</td>";
-# }
-
- print "<td class=\"hlUpdated\" onclick='view($id)'><nobr>$updated_fmt </nobr></td>";
+
+ print "<td class=\"hlUpdated\"
+ onclick='return hlClicked(event,$id)'><nobr>$updated_fmt
+ </nobr></td>";
print "<td class='hlMarkedPic'>$score_pic</td>";
print "</div>";
print "<div class=\"cdmContent\" $content_hidden
- title=\"".__("Click to select article")."\"
- onclick=\"toggleSelected($id);\"
+ onclick=\"return cdmClicked(event, $id);\"
id=\"CICD-$id\">";
print "<div class=\"cdmContentInner\">";
}
}
- $article_content = sanitize_rss($link, $line["content_preview"]);
+ // FIXME: make this less of a hack
+
+ $feed_site_url = false;
+
+ if ($line["feed_id"]) {
+ $tmp_result = db_query($link, "SELECT site_url FROM ttrss_feeds
+ WHERE id = " . $line["feed_id"]);
+
+ if (db_num_rows($tmp_result) == 1) {
+ $feed_site_url = db_fetch_result($tmp_result, 0, "site_url");
+ }
+ }
+
+ $article_content = sanitize_rss($link, $line["content_preview"],
+ false, false, $feed_site_url);
+
+ if (!$article_content) $article_content = " ";
print "<div id=\"POSTNOTE-$id\">";
if ($line['note']) {
print "<img src=\"images/digest_checkbox.png\"
style=\"cursor : pointer\" style=\"cursor : pointer\"
- onclick=\"cdmDismissArticle($id)\"
+ onclick=\"dismissArticle($id)\"
alt='Dismiss' title='".__('Dismiss article')."'>";
print "</div>";
}
}
- if (!$offset) print "<div class='whiteBox'>$message</div>";
+ if (!$offset && $message) {
+ print "<div class='whiteBox'>$message";
+
+ print "<p class=\"small\"><span class=\"insensitive\">";
+
+ $result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+ WHERE owner_uid = " . $_SESSION['uid']);
+
+ $last_updated = db_fetch_result($result, 0, "last_updated");
+ $last_updated = make_local_datetime($link, $last_updated, false);
+
+ printf(__("Feeds last updated at %s"), $last_updated);
+
+ $result = db_query($link, "SELECT COUNT(id) AS num_errors
+ FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
+
+ $num_errors = db_fetch_result($result, 0, "num_errors");
+
+ if ($num_errors > 0) {
+ print "<br/>";
+ print "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
+ __('Some feeds have update errors (click for details)')."</a>";
+ }
+ print "</span></p></div>";
+ }
}
if (!$offset) {
//prepend slash if the URL has no slash in it
// "http://www.example" -> "http://www.example/"
- if (strpos($url, '/', 7) === false) {
+ if (strpos($url, '/', strpos($url, ':') + 3) === false) {
$url .= '/';
}
return $url;
if ($title == '') {
$title = $entry->getAttribute('type');
}
- $feedUrl = $entry->getAttribute('href');
- if (strpos($feedUrl, '://') === false) {
- //no protocol -> relative URL
- $feedUrl = $baseUrl . $feedUrl;
- }
+ $feedUrl = rewrite_relative_url(
+ $baseUrl, $entry->getAttribute('href')
+ );
$feedUrls[$feedUrl] = $title;
}
}
*/
function url_is_html($url) {
$content = substr(fetch_file_contents($url, false), 0, 1000);
- if (strpos($content, '<html>') === false
- && strpos($content, '<html ') === false
+ if (stripos($content, '<html>') === false
+ && stripos($content, '<html ') === false
) {
return false;
}
}
}
+ function getLastArticleId($link) {
+ $result = db_query($link, "SELECT MAX(ref_id) AS id FROM ttrss_user_entries
+ WHERE owner_uid = " . $_SESSION["uid"]);
+
+ if (db_num_rows($result) == 1) {
+ return db_fetch_result($result, 0, "id");
+ } else {
+ return -1;
+ }
+ }
+
+ function build_url($parts) {
+ return $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
+ }
+
+ /**
+ * Converts a (possibly) relative URL to a absolute one.
+ *
+ * @param string $url Base URL (i.e. from where the document is)
+ * @param string $rel_url Possibly relative URL in the document
+ *
+ * @return string Absolute URL
+ */
+ function rewrite_relative_url($url, $rel_url) {
+ if (strpos($rel_url, "://") !== false) {
+ return $rel_url;
+ } else if (strpos($rel_url, "/") === 0)
+ {
+ $parts = parse_url($url);
+ $parts['path'] = $rel_url;
+
+ return build_url($parts);
+
+ } else {
+ $parts = parse_url($url);
+ if (!isset($parts['path'])) {
+ $parts['path'] = '/';
+ }
+ $dir = $parts['path'];
+ if (substr($dir, -1) !== '/') {
+ $dir = dirname($parts['path']);
+ $dir !== '/' && $dir .= '/';
+ }
+ $parts['path'] = $dir . $rel_url;
+
+ return build_url($parts);
+ }
+ }
+
?>
git.wh0rd.org / tt-rss.git / blobdiff