$params['simple_update'] = defined('SIMPLE_UPDATE_MODE') && SIMPLE_UPDATE_MODE;
+ $params["icon_alert"] = base64_img("images/alert.png");
+ $params["icon_information"] = base64_img("images/information.png");
+ $params["icon_cross"] = base64_img("images/cross.png");
+ $params["icon_indicator_white"] = base64_img("images/indicator_white.gif");
+
return $params;
}
"toggle_publ" => __("Toggle published"),
"toggle_unread" => __("Toggle unread"),
"edit_tags" => __("Edit tags"),
- "dismiss_selected" => __("Dismiss selected"),
- "dismiss_read" => __("Dismiss read"),
"open_in_new_window" => __("Open in new window"),
"catchup_below" => __("Mark below as read"),
"catchup_above" => __("Mark above as read"),
"feed_edit" => __("Edit feed"),
"feed_catchup" => __("Mark as read"),
"feed_reverse" => __("Reverse headlines"),
+ "feed_toggle_vgroup" => __("Toggle headline grouping"),
"feed_debug_update" => __("Debug feed update"),
+ "feed_debug_viewfeed" => __("Debug viewfeed()"),
"catchup_all" => __("Mark all feeds as read"),
"cat_toggle_collapse" => __("Un/collapse current category"),
"toggle_combined_mode" => __("Toggle combined mode"),
"*s" => "toggle_publ",
"u" => "toggle_unread",
"*t" => "edit_tags",
- "*d" => "dismiss_selected",
- "*x" => "dismiss_read",
"o" => "open_in_new_window",
"c p" => "catchup_below",
"c n" => "catchup_above",
"f e" => "feed_edit",
"f q" => "feed_catchup",
"f x" => "feed_reverse",
+ "f g" => "feed_toggle_vgroup",
"f *d" => "feed_debug_update",
+ "f *g" => "feed_debug_viewfeed",
"f *c" => "toggle_combined_mode",
"f c" => "toggle_cdm_expanded",
"*q" => "catchup_all",
function check_for_update() {
if (defined("GIT_VERSION_TIMESTAMP")) {
- $content = @fetch_file_contents("http://tt-rss.org/version.json");
+ $content = @fetch_file_contents(array("url" => "http://tt-rss.org/version.json", "timeout" => 5));
if ($content) {
$content = json_decode($content, true);
return "";
}
- function make_runtime_info() {
+ function make_runtime_info($disable_update_check = false) {
$data = array();
$result = db_query("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
$data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE');
- if (CHECK_FOR_UPDATES && $_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
+ if (CHECK_FOR_UPDATES && !$disable_update_check && $_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
$update_result = @check_for_update();
$data["update_result"] = $update_result;
function search_to_sql($search, $search_language) {
- $keywords = str_getcsv($search, " ");
+ $keywords = str_getcsv(trim($search), " ");
$query_keywords = array();
$search_words = array();
$search_query_leftover = array();
$override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false;
$start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false;
$check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false;
- $api_request = isset($params["api_request"]) ? $params["api_request"] : false;
+ $skip_first_id_check = isset($params["skip_first_id_check"]) ? $params["skip_first_id_check"] : false;
$ext_tables_part = "";
$query_strategy_part = "";
}
$view_query_part = "";
- $disable_offsets = false;
if ($view_mode == "adaptive") {
if ($search) {
if ($unread > 0) {
$view_query_part = " unread = true AND ";
- $disable_offsets = !$api_request && get_pref("CDM_AUTO_CATCHUP") && get_pref("CDM_EXPANDED");
}
}
}
if ($view_mode == "unread" && $feed != -6) {
$view_query_part = " unread = true AND ";
- $disable_offsets = !$api_request && get_pref("CDM_AUTO_CATCHUP") && get_pref("CDM_EXPANDED");
}
if ($limit > 0) {
} else {
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
- $ext_tables_part = ",ttrss_labels2,ttrss_user_labels2";
+ $ext_tables_part = "ttrss_labels2,ttrss_user_labels2,";
$query_strategy_part = "ttrss_labels2.id = ttrss_user_labels2.label_id AND
ttrss_user_labels2.article_id = ref_id";
}
} else if ($feed == -6) { // recently read
$query_strategy_part = "unread = false AND last_read IS NOT NULL";
+
+ if (DB_TYPE == "pgsql") {
+ $query_strategy_part .= " AND last_read > NOW() - INTERVAL '1 DAY' ";
+ } else {
+ $query_strategy_part .= " AND last_read > DATE_SUB(NOW(), INTERVAL 1 DAY) ";
+ }
+
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$allow_archived = true;
$ignore_vfeed_group = true;
ttrss_user_labels2.article_id = ref_id";
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
- $ext_tables_part = ",ttrss_labels2,ttrss_user_labels2";
+ $ext_tables_part = "ttrss_labels2,ttrss_user_labels2,";
$allow_archived = true;
} else {
$last_error = db_fetch_result($result, 0, "last_error");
$last_updated = db_fetch_result($result, 0, "last_updated");
} else {
- $feed_title = getFeedTitle($feed);
+ $feed_title = Feeds::getFeedTitle($feed);
}
}
}
}
if (!$allow_archived) {
- $from_qpart = "ttrss_entries,ttrss_user_entries,ttrss_feeds$ext_tables_part";
+ $from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id),ttrss_feeds";
$feed_check_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
} else {
- $from_qpart = "ttrss_entries$ext_tables_part,ttrss_user_entries
+ $from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id)
LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
}
$sanity_interval_qpart = "date_entered >= DATE_SUB(NOW(), INTERVAL 1 hour) AND";
}
- if (!$search && !$disable_offsets) {
+ if (!$search && !$skip_first_id_check) {
// if previous topmost article id changed that means our current pagination is no longer valid
$query = "SELECT DISTINCT
ttrss_feeds.title,
$from_qpart
WHERE
$feed_check_qpart
- ttrss_user_entries.ref_id = ttrss_entries.id AND
ttrss_user_entries.owner_uid = '$owner_uid' AND
$search_query_part
$start_ts_query_part
}
}
- if ($disable_offsets) {
- $offset_query_part = "";
- }
-
$query = "SELECT DISTINCT
date_entered,
guid,
$from_qpart
WHERE
$feed_check_qpart
- ttrss_user_entries.ref_id = ttrss_entries.id AND
ttrss_user_entries.owner_uid = '$owner_uid' AND
$search_query_part
$start_ts_query_part
marked,
num_comments,
comments,
+ int_id,
tag_cache,
label_cache,
link,
}
function iframe_whitelisted($entry) {
- $whitelist = array("youtube.com", "youtu.be", "vimeo.com");
+ $whitelist = array("youtube.com", "youtu.be", "vimeo.com", "player.vimeo.com");
@$src = parse_url($entry->getAttribute("src"), PHP_URL_HOST);
$doc->loadHTML($charset_hack . $res);
$xpath = new DOMXPath($doc);
- $entries = $xpath->query('(//a[@href]|//img[@src])');
+ $ttrss_uses_https = parse_url(get_self_url_prefix(), PHP_URL_SCHEME) === 'https';
+ $rewrite_base_url = $site_url ? $site_url : SELF_URL_PATH;
+
+ $entries = $xpath->query('(//a[@href]|//img[@src]|//video/source[@src]|//audio/source[@src])');
foreach ($entries as $entry) {
- if ($site_url) {
+ if ($entry->hasAttribute('href')) {
+ $entry->setAttribute('href',
+ rewrite_relative_url($rewrite_base_url, $entry->getAttribute('href')));
+
+ $entry->setAttribute('rel', 'noopener noreferrer');
+ }
- if ($entry->hasAttribute('href')) {
- $entry->setAttribute('href',
- rewrite_relative_url($site_url, $entry->getAttribute('href')));
+ if ($entry->hasAttribute('src')) {
+ $src = rewrite_relative_url($rewrite_base_url, $entry->getAttribute('src'));
+ $cached_filename = CACHE_DIR . '/images/' . sha1($src);
- $entry->setAttribute('rel', 'noreferrer');
- }
+ if (file_exists($cached_filename)) {
- if ($entry->hasAttribute('src')) {
- $src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
+ // this is strictly cosmetic
+ if ($entry->tagName == 'img') {
+ $suffix = ".png";
+ } else if ($entry->parentNode && $entry->parentNode->tagName == "video") {
+ $suffix = ".mp4";
+ } else if ($entry->parentNode && $entry->parentNode->tagName == "audio") {
+ $suffix = ".ogg";
+ } else {
+ $suffix = "";
+ }
- $cached_filename = CACHE_DIR . '/images/' . sha1($src) . '.png';
+ $src = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($src) . $suffix;
- if (file_exists($cached_filename)) {
- $src = SELF_URL_PATH . '/public.php?op=cached_image&hash=' . sha1($src);
+ if ($entry->hasAttribute('srcset')) {
+ $entry->removeAttribute('srcset');
}
- $entry->setAttribute('src', $src);
+ if ($entry->hasAttribute('sizes')) {
+ $entry->removeAttribute('sizes');
+ }
}
- if ($entry->nodeName == 'img') {
- if (($owner && get_pref("STRIP_IMAGES", $owner)) ||
- $force_remove_images || $_SESSION["bw_limit"]) {
+ $entry->setAttribute('src', $src);
+ }
- $p = $doc->createElement('p');
+ if ($entry->nodeName == 'img') {
- $a = $doc->createElement('a');
- $a->setAttribute('href', $entry->getAttribute('src'));
+ if ($entry->hasAttribute('src')) {
+ $is_https_url = parse_url($entry->getAttribute('src'), PHP_URL_SCHEME) === 'https';
- $a->appendChild(new DOMText($entry->getAttribute('src')));
- $a->setAttribute('target', '_blank');
+ if ($ttrss_uses_https && !$is_https_url) {
- $p->appendChild($a);
+ if ($entry->hasAttribute('srcset')) {
+ $entry->removeAttribute('srcset');
+ }
- $entry->parentNode->replaceChild($p, $entry);
+ if ($entry->hasAttribute('sizes')) {
+ $entry->removeAttribute('sizes');
+ }
}
}
+
+ if (($owner && get_pref("STRIP_IMAGES", $owner)) ||
+ $force_remove_images || $_SESSION["bw_limit"]) {
+
+ $p = $doc->createElement('p');
+
+ $a = $doc->createElement('a');
+ $a->setAttribute('href', $entry->getAttribute('src'));
+
+ $a->appendChild(new DOMText($entry->getAttribute('src')));
+ $a->setAttribute('target', '_blank');
+ $a->setAttribute('rel', 'noopener noreferrer');
+
+ $p->appendChild($a);
+
+ $entry->parentNode->replaceChild($p, $entry);
+ }
}
if (strtolower($entry->nodeName) == "a") {
$entry->setAttribute("target", "_blank");
+ $entry->setAttribute("rel", "noopener noreferrer");
}
}
}
}
- $allowed_elements = array('a', 'address', 'audio', 'article', 'aside',
+ $allowed_elements = array('a', 'address', 'acronym', 'audio', 'article', 'aside',
'b', 'bdi', 'bdo', 'big', 'blockquote', 'body', 'br',
'caption', 'cite', 'center', 'code', 'col', 'colgroup',
- 'data', 'dd', 'del', 'details', 'div', 'dl', 'font',
+ 'data', 'dd', 'del', 'details', 'description', 'dfn', 'div', 'dl', 'font',
'dt', 'em', 'footer', 'figure', 'figcaption',
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'html', 'i',
'img', 'ins', 'kbd', 'li', 'main', 'mark', 'nav', 'noscript',
'ol', 'p', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',
'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
- 'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video' );
+ 'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
$res = $doc->saveHTML();
- return $res;
+ /* strip everything outside of <body>...</body> */
+
+ $res_frag = array();
+ if (preg_match('/<body>(.*)<\/body>/is', $res, $res_frag)) {
+ return $res_frag[1];
+ } else {
+ return $res;
+ }
}
function strip_harmful_tags($doc, $allowed_elements, $disallowed_attributes) {
array_push($attrs_to_remove, $attr);
}
+ if ($attr->nodeName == 'href' && stripos($attr->value, 'javascript:') === 0) {
+ array_push($attrs_to_remove, $attr);
+ }
+
if (in_array($attr->nodeName, $disallowed_attributes)) {
array_push($attrs_to_remove, $attr);
}
}
}
- 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");
-
- $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');
function tag_is_valid($tag) {
if ($tag == '') return false;
- if (preg_match("/^[0-9]*$/", $tag)) return false;
+ if (is_numeric($tag)) return false;
if (mb_strlen($tag) > 250) return false;
if (!$tag) return false;
exit;
}
- function format_warning($msg, $id = "") {
- return "<div class=\"warning\" id=\"$id\">
- <span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
- }
-
- function format_notice($msg, $id = "") {
- return "<div class=\"notice\" id=\"$id\">
- <span><img src=\"images/information.png\"></span><span>$msg</span></div>";
- }
-
- function format_error($msg, $id = "") {
- return "<div class=\"error\" id=\"$id\">
- <span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
- }
-
- function print_notice($msg) {
- return print format_notice($msg);
- }
-
- function print_warning($msg) {
- return print format_warning($msg);
- }
-
- function print_error($msg) {
- return print format_error($msg);
- }
-
-
function T_sprintf() {
$args = func_get_args();
return vsprintf(__(array_shift($args)), $args);
}
- function format_inline_player($url, $ctype) {
-
- $entry = "";
-
- $url = htmlspecialchars($url);
-
- if (strpos($ctype, "audio/") === 0) {
-
- if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
- $_SESSION["hasMp3"])) {
-
- $entry .= "<audio preload=\"none\" controls>
- <source type=\"$ctype\" src=\"$url\"/>
- </audio>";
-
- } else {
-
- $entry .= "<object type=\"application/x-shockwave-flash\"
- data=\"lib/button/musicplayer.swf?song_url=$url\"
- width=\"17\" height=\"17\" style='float : left; margin-right : 5px;'>
- <param name=\"movie\"
- value=\"lib/button/musicplayer.swf?song_url=$url\" />
- </object>";
- }
-
- if ($entry) $entry .= " <a target=\"_blank\"
- href=\"$url\">" . basename($url) . "</a>";
-
- return $entry;
-
- }
-
- return "";
-
-/* $filename = substr($url, strrpos($url, "/")+1);
-
- $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
- $filename . " (" . $ctype . ")" . "</a>"; */
-
- }
-
- 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 "<article id='$id'><![CDATA["; };
-
- if ($mark_as_read) {
- $result = db_query("UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW()
- WHERE ref_id = '$id' AND owner_uid = $owner_uid");
-
- ccache_update($feed_id, $owner_uid);
- }
-
- $result = db_query("SELECT id,title,link,content,feed_id,comments,int_id,lang,
- ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
- (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
- (SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
- (SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images,
- (SELECT always_display_enclosures FROM ttrss_feeds WHERE id = feed_id) as always_display_enclosures,
- num_comments,
- tag_cache,
- author,
- orig_feed_id,
- note
- FROM ttrss_entries,ttrss_user_entries
- WHERE id = '$id' AND ref_id = id AND owner_uid = $owner_uid");
-
- if ($result) {
-
- $line = db_fetch_assoc($result);
-
- $line["tags"] = get_article_tags($id, $owner_uid, $line["tag_cache"]);
- unset($line["tag_cache"]);
-
- $line["content"] = sanitize($line["content"],
- sql_bool_to_bool($line['hide_images']),
- $owner_uid, $line["site_url"], false, $line["id"]);
-
- foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
- $line = $p->hook_render_article($line);
- }
-
- $num_comments = $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 = "<a class=\"postComments\"
- target='_blank' href=\"$comments_url\">$num_comments ".
- _ngettext("comment", "comments", $num_comments)."</a>";
-
- } else {
- if ($line["comments"] && $line["link"] != $line["comments"]) {
- $entry_comments = "<a class=\"postComments\" target='_blank' href=\"".htmlspecialchars($line["comments"])."\">".__("comments")."</a>";
- }
- }
-
- if ($zoom_mode) {
- header("Content-Type: text/html");
- $rv['content'] .= "<html><head>
- <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
- <title>Tiny Tiny RSS - ".$line["title"]."</title>".
- stylesheet_tag("css/tt-rss.css").
- stylesheet_tag("css/zoom.css").
- stylesheet_tag("css/dijit.css")."
-
- <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
- <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
-
- <script type=\"text/javascript\">
- function openSelectedAttachment(elem) {
- try {
- var url = elem[elem.selectedIndex].value;
-
- if (url) {
- window.open(url);
- elem.selectedIndex = 0;
- }
-
- } catch (e) {
- exception_error(\"openSelectedAttachment\", e);
- }
- }
- </script>
- </head><body id=\"ttrssZoom\">";
- }
-
- $rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">";
-
- $rv['content'] .= "<div class=\"postHeader\" id=\"POSTHDR-$id\">";
-
- $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'] .= "<div class=\"postDate\">$parsed_updated</div>";
-
- if ($line["link"]) {
- $rv['content'] .= "<div class='postTitle'><a target='_blank'
- title=\"".htmlspecialchars($line['title'])."\"
- href=\"" .
- htmlspecialchars($line["link"]) . "\">" .
- $line["title"] . "</a>" .
- "<span class='author'>$entry_author</span></div>";
- } else {
- $rv['content'] .= "<div class='postTitle'>" . $line["title"] . "$entry_author</div>";
- }
-
- if ($zoom_mode) {
- $feed_title = "<a href=\"".htmlspecialchars($line["site_url"]).
- "\" target=\"_blank\">".
- htmlspecialchars($line["feed_title"])."</a>";
-
- $rv['content'] .= "<div class=\"postFeedTitle\">$feed_title</div>";
-
- $rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
- }
-
- $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'] .= "<div class='postTags' style='float : right'>
- <img src='images/tag.png'
- class='tagsPic' alt='Tags' title='Tags'> ";
-
- if (!$zoom_mode) {
- $rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>
- <a title=\"".__('Edit tags for this article')."\"
- href=\"#\" onclick=\"editArticleTags($id, $feed_id)\">(+)</a>";
-
- $rv['content'] .= "<div dojoType=\"dijit.Tooltip\"
- id=\"ATSTRTIP-$id\" connectId=\"ATSTR-$id\"
- position=\"below\">$tags_str_full</div>";
-
- 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'] .= "<span id=\"ATSTR-$id\">$tags_str</span>";
- }
- $rv['content'] .= "</div>";
- $rv['content'] .= "<div clear='both'>";
-
- foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
- $rv['content'] .= $p->hook_article_left_button($line);
- }
-
- $rv['content'] .= "$entry_comments</div>";
-
- if ($line["orig_feed_id"]) {
-
- $tmp_result = db_query("SELECT * FROM ttrss_archived_feeds
- WHERE id = ".$line["orig_feed_id"]);
-
- if (db_num_rows($tmp_result) != 0) {
-
- $rv['content'] .= "<div clear='both'>";
- $rv['content'] .= __("Originally from:");
-
- $rv['content'] .= " ";
-
- $tmp_line = db_fetch_assoc($tmp_result);
-
- $rv['content'] .= "<a target='_blank'
- href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
- $tmp_line['title'] . "</a>";
-
- $rv['content'] .= " ";
-
- $rv['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
- $rv['content'] .= "<img title='".__('Feed URL')."' class='tinyFeedIcon' src='images/pub_set.png'></a>";
-
- $rv['content'] .= "</div>";
- }
- }
-
- $rv['content'] .= "</div>";
-
- $rv['content'] .= "<div id=\"POSTNOTE-$id\">";
- if ($line['note']) {
- $rv['content'] .= format_article_note($id, $line['note'], !$zoom_mode);
- }
- $rv['content'] .= "</div>";
-
- if (!$line['lang']) $line['lang'] = 'en';
-
- $rv['content'] .= "<div class=\"postContent\" lang=\"".$line['lang']."\">";
-
- $rv['content'] .= $line["content"];
- $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'] .= "</div>";
-
- $rv['content'] .= "</div>";
-
- }
-
- if ($zoom_mode) {
- $rv['content'] .= "
- <div class='footer'>
- <button onclick=\"return window.close()\">".
- __("Close this window")."</button></div>";
- $rv['content'] .= "</body></html>";
- }
-
- return $rv;
-
- }
-
function print_checkpoint($n, $s) {
$ts = microtime(true);
echo sprintf("<!-- CP[$n] %.4f seconds -->\n", $ts - $s);
}
} // function encrypt_password
- function load_filters($feed_id, $owner_uid, $action_id = false) {
+ function load_filters($feed_id, $owner_uid) {
$filters = array();
$cat_id = (int)getFeedCategory($feed_id);
return true;
}
- function format_tags_string($tags, $id) {
- 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 .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed('".$tags[$i]."')\">" . $tags[$i] . "</a>, ";
- }
-
- $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, $id) {
-
- if (!is_array($labels)) return '';
-
- $labels_str = "";
-
- foreach ($labels as $l) {
- $labels_str .= sprintf("<span class='hlLabelRef'
- style='color : %s; background-color : %s'>%s</span>",
- $l[2], $l[3], $l[1]);
- }
-
- return $labels_str;
-
- }
-
- function format_article_note($id, $note, $allow_edit = true) {
-
- $str = "<div class='articleNote' onclick=\"editArticleNote($id)\">
- <div class='noteEdit' onclick=\"editArticleNote($id)\">".
- ($allow_edit ? __('(edit note)') : "")."</div>$note</div>";
-
- return $str;
- }
-
-
- function get_feed_category($feed_cat, $parent_cat_id = false) {
- if ($parent_cat_id) {
- $parent_qpart = "parent_cat = '$parent_cat_id'";
- $parent_insert = "'$parent_cat_id'";
- } else {
- $parent_qpart = "parent_cat IS NULL";
- $parent_insert = "NULL";
- }
-
- $result = db_query(
- "SELECT id FROM ttrss_feed_categories
- WHERE $parent_qpart AND title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
-
- if (db_num_rows($result) == 0) {
- return false;
- } else {
- return db_fetch_result($result, 0, "id");
- }
- }
-
function add_feed_category($feed_cat, $parent_cat_id = false) {
if (!$feed_cat) return false;
return false;
}
- function getArticleFeed($id) {
- $result = db_query("SELECT feed_id FROM ttrss_user_entries
- WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-
- if (db_num_rows($result) != 0) {
- return db_fetch_result($result, 0, "feed_id");
- } else {
- return 0;
- }
- }
-
/**
* Fixes incomplete URLs by prepending "http://".
* Also replaces feed:// with http://, and
$url .= '/';
}
+ //convert IDNA hostname to punycode if possible
+ if (function_exists("idn_to_ascii")) {
+ $parts = parse_url($url);
+ if (mb_detect_encoding($parts['host']) != 'ASCII')
+ {
+ $parts['host'] = idn_to_ascii($parts['host']);
+ $url = build_url($parts);
+ }
+ }
+
if ($url != "http:///")
return $url;
else
}
- 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)) {
- array_push($rv, $line);
- }
- }
-
- return $rv;
- }
-
/* function save_email_address($email) {
// FIXME: implement persistent storage of emails
return is_html(fetch_file_contents($url, false, $login, $pass));
}
- function print_label_select($name, $value, $attributes = "") {
-
- $result = db_query("SELECT caption FROM ttrss_labels2
- WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
-
- print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
- "\" $attributes onchange=\"labelSelectOnChange(this)\" >";
-
- while ($line = db_fetch_assoc($result)) {
-
- $issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
-
- print "<option value=\"".htmlspecialchars($line["caption"])."\"
- $issel>" . htmlspecialchars($line["caption"]) . "</option>";
-
- }
-
-# print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
-
- print "</select>";
-
-
- }
-
- 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;
- }
- }
-
- if ($rv === '' && !empty($result)) {
- $entries_html = array();
- $entries = array();
- $entries_inline = array();
-
- foreach ($result as $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);
-
- $player = format_inline_player($url, $ctype);
-
- if ($player) array_push($entries_inline, $player);
-
-# $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
-# $filename . " (" . $ctype . ")" . "</a>";
-
- $entry = "<div onclick=\"window.open('".htmlspecialchars($url)."')\"
- dojoType=\"dijit.MenuItem\">$filename ($ctype)</div>";
-
- 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("/<img/i", $article_content)) {
-
- foreach ($entries as $entry) {
-
- foreach (PluginHost::getInstance()->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"]) ||
- preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
-
- if (!$hide_images) {
- $encsize = '';
- if ($entry['height'] > 0)
- $encsize .= ' height="' . intval($entry['width']) . '"';
- if ($entry['width'] > 0)
- $encsize .= ' width="' . intval($entry['height']) . '"';
- $rv .= "<p><img
- alt=\"".htmlspecialchars($entry["filename"])."\"
- src=\"" .htmlspecialchars($entry["url"]) . "\"
- " . $encsize . " /></p>";
- } else {
- $rv .= "<p><a target=\"_blank\"
- href=\"".htmlspecialchars($entry["url"])."\"
- >" .htmlspecialchars($entry["url"]) . "</a></p>";
- }
-
- if ($entry['title']) {
- $rv.= "<div class=\"enclosure_title\">${entry['title']}</div>";
- }
- }
- }
- }
- }
- }
-
- if (count($entries_inline) > 0) {
- $rv .= "<hr clear='both'/>";
- foreach ($entries_inline as $entry) { $rv .= $entry; };
- $rv .= "<hr clear='both'/>";
- }
-
- $rv .= "<select class=\"attachments\" onchange=\"openSelectedAttachment(this)\">".
- "<option value=''>" . __('Attachments')."</option>";
-
- foreach ($entries as $entry) {
- if ($entry["title"])
- $title = "— " . truncate_string($entry["title"], 30);
- else
- $title = "";
-
- $rv .= "<option value=\"".htmlspecialchars($entry["url"])."\">" . htmlspecialchars($entry["filename"]) . "$title</option>";
-
- };
-
- $rv .= "</select>";
- }
-
- 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");
return $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
}
+ function cleanup_url_path($path) {
+ $path = str_replace("/./", "/", $path);
+ $path = str_replace("//", "/", $path);
+
+ return $path;
+ }
+
/**
* Converts a (possibly) relative URL to a absolute one.
*
* @return string Absolute URL
*/
function rewrite_relative_url($url, $rel_url) {
- if (strpos($rel_url, ":") !== false) {
- return $rel_url;
- } else if (strpos($rel_url, "://") !== false) {
+ if (strpos($rel_url, "://") !== false) {
return $rel_url;
} else if (strpos($rel_url, "//") === 0) {
# protocol-relative URL (rare but they exist)
return $rel_url;
- } else if (strpos($rel_url, "/") === 0)
- {
+ } else if (preg_match("/^[a-z]+:/i", $rel_url)) {
+ # magnet:, feed:, etc
+ return $rel_url;
+ } else if (strpos($rel_url, "/") === 0) {
$parts = parse_url($url);
$parts['path'] = $rel_url;
+ $parts['path'] = cleanup_url_path($parts['path']);
return build_url($parts);
$dir !== '/' && $dir .= '/';
}
$parts['path'] = $dir . $rel_url;
+ $parts['path'] = cleanup_url_path($parts['path']);
return build_url($parts);
}
return null;
}
- function tmpdirname($path, $prefix) {
- // Use PHP's tmpfile function to create a temporary
- // directory name. Delete the file and keep the name.
- $tempname = tempnam($path,$prefix);
- if (!$tempname)
- return false;
-
- if (!unlink($tempname))
- return false;
-
- return $tempname;
- }
-
function getFeedCategory($feed) {
$result = db_query("SELECT cat_id FROM ttrss_feeds
WHERE id = '$feed'");
return in_array($interface, class_implements($class));
}
- function geturl($url, $depth = 0, $nobody = true){
-
- if ($depth == 20) return $url;
-
- if (!function_exists('curl_init'))
- return user_error('CURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini', E_USER_ERROR);
-
- $curl = curl_init();
- $header[0] = "Accept: text/xml,application/xml,application/xhtml+xml,";
- $header[0] .= "text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5";
- $header[] = "Cache-Control: max-age=0";
- $header[] = "Connection: keep-alive";
- $header[] = "Keep-Alive: 300";
- $header[] = "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7";
- $header[] = "Accept-Language: en-us,en;q=0.5";
- $header[] = "Pragma: ";
-
- curl_setopt($curl, CURLOPT_URL, $url);
- curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0 Firefox/5.0');
- curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
- curl_setopt($curl, CURLOPT_HEADER, true);
- curl_setopt($curl, CURLOPT_NOBODY, $nobody);
- curl_setopt($curl, CURLOPT_REFERER, $url);
- curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate');
- curl_setopt($curl, CURLOPT_AUTOREFERER, true);
- curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
- //curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); //CURLOPT_FOLLOWLOCATION Disabled...
- curl_setopt($curl, CURLOPT_TIMEOUT, 60);
- curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-
- if (defined('_CURL_HTTP_PROXY')) {
- curl_setopt($curl, CURLOPT_PROXY, _CURL_HTTP_PROXY);
- }
-
- $html = curl_exec($curl);
-
- $status = curl_getinfo($curl);
-
- if($status['http_code']!=200){
-
- // idiot site not allowing http head
- if($status['http_code'] == 405) {
- curl_close($curl);
- return geturl($url, $depth +1, false);
- }
-
- if($status['http_code'] == 301 || $status['http_code'] == 302) {
- curl_close($curl);
- list($header) = explode("\r\n\r\n", $html, 2);
- $matches = array();
- preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
- $url = trim(str_replace($matches[1],"",$matches[0]));
- $url_parsed = parse_url($url);
- return (isset($url_parsed))? geturl($url, $depth + 1):'';
- }
-
- global $fetch_last_error;
-
- $fetch_last_error = curl_errno($curl) . " " . curl_error($curl);
- curl_close($curl);
-
-# $oline='';
-# foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
-# $line =$oline." \r\n ".$url."\r\n-----------------\r\n";
-# $handle = @fopen('./curl.error.log', 'a');
-# fwrite($handle, $line);
- return FALSE;
- }
- curl_close($curl);
- return $url;
- }
-
function get_minified_js($files) {
require_once 'lib/jshrink/Minifier.php';
return $rv;
}
- function stylesheet_tag($filename) {
- $timestamp = filemtime($filename);
-
- return "<link rel=\"stylesheet\" type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
- }
-
- function javascript_tag($filename) {
- $query = "";
-
- if (!(strpos($filename, "?") === FALSE)) {
- $query = substr($filename, strpos($filename, "?")+1);
- $filename = substr($filename, 0, strpos($filename, "?"));
- }
-
- $timestamp = filemtime($filename);
-
- if ($query) $timestamp .= "&$query";
-
- return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
- }
-
function calculate_dep_timestamp() {
$files = array_merge(glob("js/*.js"), glob("css/*.css"));
}
function theme_valid($theme) {
- if ($theme == "default.css" || $theme == "night.css") return true; // needed for array_filter
+ $bundled_themes = [ "default.php", "night.css", "compact.css" ];
+
+ if (in_array($theme, $bundled_themes)) return true;
+
$file = "themes/" . basename($theme);
if (!file_exists($file)) $file = "themes.local/" . basename($theme);
return false;
}
+ /**
+ * @SuppressWarnings(unused)
+ */
function error_json($code) {
require_once "errors.php";
return $tmp;
}
-?>
+
+ function get_upload_error_message($code) {
+
+ $errors = array(
+ 0 => __('There is no error, the file uploaded with success'),
+ 1 => __('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
+ 2 => __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
+ 3 => __('The uploaded file was only partially uploaded'),
+ 4 => __('No file was uploaded'),
+ 6 => __('Missing a temporary folder'),
+ 7 => __('Failed to write file to disk.'),
+ 8 => __('A PHP extension stopped the file upload.'),
+ );
+
+ return $errors[$code];
+ }
+
+ function base64_img($filename) {
+ if (file_exists($filename)) {
+ $ext = pathinfo($filename, PATHINFO_EXTENSION);
+
+ return "data:image/$ext;base64," . base64_encode(file_get_contents($filename));
+ } else {
+ return "";
+ }
+ }
+
git.wh0rd.org / tt-rss.git / blobdiff