<?php
date_default_timezone_set('UTC');
-
- if ($_REQUEST["debug"]) {
- define('DEFAULT_ERROR_LEVEL', E_ALL);
+ if (defined('E_DEPRECATED')) {
+ error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+ } else {
+ error_reporting(E_ALL & ~E_NOTICE);
}
require_once 'config.php';
}
}
- function fetch_file_contents($url, $type) {
+ function fetch_file_contents($url, $type = false) {
if (USE_CURL_FOR_ICONS) {
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- $contents = curl_exec($ch);
+ $contents = @curl_exec($ch);
if ($contents === false) {
curl_close($ch);
return false;
return $contents;
} else {
- return file_get_contents($url);
+ return @file_get_contents($url);
}
}
*/
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 "FAVICON [$site_url]: $favicon_url\n";
- error_reporting(0);
-
$icon_file = ICONS_DIR . "/$feed.ico";
if ($favicon_url && !file_exists($icon_file)) {
}
}
}
-
- error_reporting(DEFAULT_ERROR_LEVEL);
-
}
function update_rss_feed($link, $feed, $ignore_daemon = false) {
_debug("update_rss_feed: fetching [$fetch_url]...");
}
- if (!defined('DAEMON_EXTENDED_DEBUG') && !$_REQUEST['xdebug']) {
- error_reporting(0);
- }
-
$obj_id = md5("FDATA:$use_simplepie:$fetch_url");
if ($memcache && $obj = $memcache->get($obj_id)) {
} else {
if (!$use_simplepie) {
- $rss = fetch_rss($fetch_url);
+ $rss = @fetch_rss($fetch_url);
} else {
if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
mkdir(SIMPLEPIE_CACHE_DIR);
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
_debug("update_rss_feed: fetch done, parsing...");
- } else {
- error_reporting (DEFAULT_ERROR_LEVEL);
}
$feed = db_escape_string($feed);
// 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']) {
if (!$num_comments) $num_comments = 0;
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ _debug("update_rss_feed: looking for tags [1]...");
+ }
+
// parse <category> entries into tags
+ $additional_tags = array();
+
if ($use_simplepie) {
- $additional_tags = array();
$additional_tags_src = $item->get_categories();
if (is_array($additional_tags_src)) {
$t_ctr = $item['category#'];
- $additional_tags = false;
-
if ($t_ctr == 0) {
- $additional_tags = false;
+ $additional_tags = array();
} else if ($t_ctr > 0) {
$additional_tags = array($item['category']);
$t_ctr = $item['dc']['subject#'];
if ($t_ctr > 0) {
- $additional_tags = array($item['dc']['subject']);
+ array_push($additional_tags, $item['dc']['subject']);
for ($i = 0; $i <= $t_ctr; $i++ ) {
if ($item['dc']["subject#$i"]) {
}
}
- // enclosures
-
- $enclosures = array();
-
- if ($use_simplepie) {
- $encs = $item->get_enclosures();
-
- if (is_array($encs)) {
- foreach ($encs as $e) {
- $e_item = array(
- $e->link, $e->type, $e->length);
-
- array_push($enclosures, $e_item);
- }
- }
-
- } else {
- // <enclosure>
-
- $e_ctr = $item['enclosure#'];
-
- if ($e_ctr > 0) {
- $e_item = array($item['enclosure@url'],
- $item['enclosure@type'],
- $item['enclosure@length']);
-
- array_push($enclosures, $e_item);
-
- for ($i = 0; $i <= $e_ctr; $i++ ) {
-
- if ($item["enclosure#$i@url"]) {
- $e_item = array($item["enclosure#$i@url"],
- $item["enclosure#$i@type"],
- $item["enclosure#$i@length"]);
- array_push($enclosures, $e_item);
- }
- }
- }
-
- // <media:content>
- // can there be many of those? yes -fox
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ _debug("update_rss_feed: looking for tags [2]...");
+ }
- $m_ctr = $item['media']['content#'];
+ /* taaaags */
+ // <a href="..." rel="tag">Xorg</a>, //
- if ($m_ctr > 0) {
- $e_item = array($item['media']['content@url'],
- $item['media']['content@medium'],
- $item['media']['content@length']);
+ $entry_tags = null;
- array_push($enclosures, $e_item);
+ preg_match_all("/<a.*?rel=['\"]tag['\"].*?\>([^<]+)<\/a>/i",
+ $entry_content_unescaped, $entry_tags);
- for ($i = 0; $i <= $m_ctr; $i++ ) {
+ $entry_tags = $entry_tags[1];
- if ($item["media"]["content#$i@url"]) {
- $e_item = array($item["media"]["content#$i@url"],
- $item["media"]["content#$i@medium"],
- $item["media"]["content#$i@length"]);
- array_push($enclosures, $e_item);
- }
- }
+ $entry_tags = array_merge($entry_tags, $additional_tags);
- }
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ _debug("update_rss_feed: unfiltered tags found:");
+ print_r($entry_tags);
}
# sanitize content
$dupcheck_qpart = "";
}
-// error_reporting(0);
+ /* Collect article tags here so we could filter by them: */
$article_filters = get_article_filters($filters, $entry_title,
- $entry_content, $entry_link, $entry_timestamp, $entry_author);
+ $entry_content, $entry_link, $entry_timestamp, $entry_author, $entry_tags);
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
_debug("update_rss_feed: article filters: ");
continue;
}
-// error_reporting (DEFAULT_ERROR_LEVEL);
-
$score = calculate_article_score($article_filters);
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
$result = db_query($link,
"INSERT INTO ttrss_user_entries
(ref_id, owner_uid, feed_id, unread, last_read, marked,
- published, score)
+ published, score, tag_cache, label_cache)
VALUES ('$ref_id', '$owner_uid', '$feed', $unread,
- $last_read_qpart, $marked, $published, '$score')");
+ $last_read_qpart, $marked, $published, '$score', '', '')");
$result = db_query($link,
"SELECT int_id FROM ttrss_user_entries WHERE
_debug("update_rss_feed: looking for enclosures...");
}
+ // enclosures
+
+ $enclosures = array();
+
+ if ($use_simplepie) {
+ $encs = $item->get_enclosures();
+
+ if (is_array($encs)) {
+ foreach ($encs as $e) {
+ $e_item = array(
+ $e->link, $e->type, $e->length);
+
+ array_push($enclosures, $e_item);
+ }
+ }
+
+ } else {
+ // <enclosure>
+
+ $e_ctr = $item['enclosure#'];
+
+ if ($e_ctr > 0) {
+ $e_item = array($item['enclosure@url'],
+ $item['enclosure@type'],
+ $item['enclosure@length']);
+
+ array_push($enclosures, $e_item);
+
+ for ($i = 0; $i <= $e_ctr; $i++ ) {
+
+ if ($item["enclosure#$i@url"]) {
+ $e_item = array($item["enclosure#$i@url"],
+ $item["enclosure#$i@type"],
+ $item["enclosure#$i@length"]);
+ array_push($enclosures, $e_item);
+ }
+ }
+ }
+
+ // <media:content>
+ // can there be many of those? yes -fox
+
+ $m_ctr = $item['media']['content#'];
+
+ if ($m_ctr > 0) {
+ $e_item = array($item['media']['content@url'],
+ $item['media']['content@medium'],
+ $item['media']['content@length']);
+
+ array_push($enclosures, $e_item);
+
+ for ($i = 0; $i <= $m_ctr; $i++ ) {
+
+ if ($item["media"]["content#$i@url"]) {
+ $e_item = array($item["media"]["content#$i@url"],
+ $item["media"]["content#$i@medium"],
+ $item["media"]["content#$i@length"]);
+ array_push($enclosures, $e_item);
+ }
+ }
+
+ }
+ }
+
+
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ _debug("update_rss_feed: article enclosures:");
print_r($enclosures);
}
db_query($link, "COMMIT");
- if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("update_rss_feed: looking for tags...");
- }
-
- /* taaaags */
- // <a href="..." rel="tag">Xorg</a>, //
-
- $entry_tags = null;
-
- preg_match_all("/<a.*?rel=['\"]tag['\"].*?>([^<]+)<\/a>/i",
- $entry_content_unescaped, $entry_tags);
-
-/* print "<p><br/>$entry_title : $entry_content_unescaped<br>";
- print_r($entry_tags);
- print "<br/></p>"; */
-
- $entry_tags = $entry_tags[1];
-
- # check for manual tags
+ // check for manual tags (we have to do it here since they're loaded from filters)
foreach ($article_filters as $f) {
if ($f[0] == "tag") {
}
}
+ // Skip boring tags
+
$boring_tags = trim_array(split(",", mb_strtolower(get_pref($link,
'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
- if ($additional_tags && is_array($additional_tags)) {
- foreach ($additional_tags as $tag) {
- if (tag_is_valid($tag) &&
- array_search($tag, $boring_tags) === FALSE) {
- array_push($entry_tags, $tag);
+ $filtered_tags = array();
+ $tags_to_cache = array();
+
+ if ($entry_tags && is_array($entry_tags)) {
+ foreach ($entry_tags as $tag) {
+ if (array_search($tag, $boring_tags) === false) {
+ array_push($filtered_tags, $tag);
}
}
}
-// print "<p>TAGS: "; print_r($entry_tags); print "</p>";
+ $filtered_tags = array_unique($filtered_tags);
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- print_r($entry_tags);
+ _debug("update_rss_feed: filtered article tags:");
+ print_r($filtered_tags);
}
- if (count($entry_tags) > 0) {
+ // Save article tags in the database
+
+ if (count($filtered_tags) > 0) {
db_query($link, "BEGIN");
- foreach ($entry_tags as $tag) {
+ foreach ($filtered_tags as $tag) {
- $tag = sanitize_tag($tag);
- $tag = db_escape_string($tag);
+ $tag = sanitize_tag($tag);
+ $tag = db_escape_string($tag);
+
+ if (!tag_is_valid($tag)) continue;
+
+ $result = db_query($link, "SELECT id FROM ttrss_tags
+ WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND
+ owner_uid = '$owner_uid' LIMIT 1");
- if (!tag_is_valid($tag)) continue;
-
- $result = db_query($link, "SELECT id FROM ttrss_tags
- WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND
- owner_uid = '$owner_uid' LIMIT 1");
-
- // print db_fetch_result($result, 0, "id");
-
if ($result && db_num_rows($result) == 0) {
db_query($link, "INSERT INTO ttrss_tags
(owner_uid,tag_name,post_int_id)
VALUES ('$owner_uid','$tag', '$entry_int_id')");
- }
- }
+ }
+
+ array_push($tags_to_cache, $tag);
+ }
+
+ /* update the cache */
+
+ $tags_to_cache = array_unique($tags_to_cache);
+
+ $tags_str = db_escape_string(join(",", $tags_to_cache));
+
+ db_query($link, "UPDATE ttrss_user_entries
+ SET tag_cache = '$tags_str' WHERE ref_id = '$entry_ref_id'
+ AND owner_uid = $owner_uid");
db_query($link, "COMMIT");
}
print "</select>";
}
- function get_article_filters($filters, $title, $content, $link, $timestamp, $author) {
+ function get_article_filters($filters, $title, $content, $link, $timestamp, $author, $tags) {
$matches = array();
if ($filters["title"]) {
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"]));
}
}
}
+ if ($filters["tag"]) {
+
+ $tag_string = join(",", $tags);
+
+ foreach ($filters["tag"] as $filter) {
+ $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))) {
+
+ array_push($matches, array($filter["action"], $filter["action_param"]));
+ }
+ }
+ }
+
+
return $matches;
}
setcookie("ttrss_lang", $_SESSION["language"],
time() + SESSION_COOKIE_LIFETIME);
}
-
- /* bump counters stamp since we're getting reloaded anyway */
-
- $_SESSION["get_all_counters_stamp"] = time();
}
} else {
function sanity_check($link) {
- error_reporting(0);
-
$error_code = 0;
$schema_version = get_schema_version($link);
$error_code = 12;
}
- error_reporting (DEFAULT_ERROR_LEVEL);
-
if ($error_code != 0) {
print_error_xml($error_code);
return false;
function file_is_locked($filename) {
if (function_exists('flock')) {
- error_reporting(0);
- $fp = fopen(LOCK_DIRECTORY . "/$filename", "r");
- error_reporting(DEFAULT_ERROR_LEVEL);
+ $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
if ($fp) {
if (flock($fp, LOCK_EX | LOCK_NB)) {
flock($fp, LOCK_UN);
}
}
- 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'];
} else if ($feed > 0) {
- $tmp_result = db_query($link, "SELECT id
- FROM ttrss_feeds WHERE parent_feed = '$feed'
- ORDER BY cat_id,title");
-
- $parent_ids = array();
-
- if (db_num_rows($tmp_result) > 0) {
- while ($p = db_fetch_assoc($tmp_result)) {
- array_push($parent_ids, "feed_id = " . $p["id"]);
- }
-
- $children_qpart = implode(" OR ", $parent_ids);
-
- db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW()
- WHERE (feed_id = '$feed' OR $children_qpart)
- AND owner_uid = $owner_uid");
-
- } else {
- db_query($link, "UPDATE ttrss_user_entries
+ db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
WHERE feed_id = '$feed' AND owner_uid = $owner_uid");
- }
-
+
} else if ($feed < 0 && $feed > -10) { // special, like starred
if ($feed == -1) {
$match_part = "true";
} else if ($n_feed >= 0) {
- $result = db_query($link, "SELECT id FROM ttrss_feeds
- WHERE parent_feed = '$n_feed'
- AND owner_uid = " . $owner_uid);
-
- if (db_num_rows($result) > 0) {
-
- $linked_feeds = array();
- while ($line = db_fetch_assoc($result)) {
- array_push($linked_feeds, "feed_id = " . $line["id"]);
- }
-
- array_push($linked_feeds, "feed_id = $n_feed");
-
- $match_part = implode(" OR ", $linked_feeds);
-
- $tmp_result = db_query($link, "SELECT COUNT(int_id) AS unread
- FROM ttrss_user_entries,ttrss_entries
- WHERE $unread_qpart AND
- ttrss_user_entries.ref_id = ttrss_entries.id AND
- $age_qpart AND
- ($match_part) AND
- owner_uid = " . $owner_uid);
-
- $unread = 0;
-
- # this needs to be rewritten
- while ($line = db_fetch_assoc($tmp_result)) {
- $unread += $line["unread"];
- }
-
- return $unread;
-
+ if ($n_feed != 0) {
+ $match_part = "feed_id = '$n_feed'";
} else {
- if ($n_feed != 0) {
- $match_part = "feed_id = '$n_feed'";
- } else {
- $match_part = "feed_id IS NULL";
- }
+ $match_part = "feed_id IS NULL";
}
+
} else if ($feed < -10) {
$label_id = -$feed - 11;
last_error, value AS count
FROM ttrss_feeds, ttrss_counters_cache
WHERE ttrss_feeds.owner_uid = ".$_SESSION["uid"]."
- AND parent_feed IS NULL
AND ttrss_counters_cache.feed_id = id";
$result = db_query($link, $query);
$has_img = feed_has_icon($id);
- $tmp_result = db_query($link,
- "SELECT SUM(value) AS unread FROM ttrss_feeds, ttrss_counters_cache
- WHERE parent_feed = '$id' AND feed_id = id");
-
- $count += db_fetch_result($tmp_result, 0, "unread");
-
$cv = array("id" => $id,
"updated" => $last_updated,
"counter" => $count,
print "</rpc-reply>";
}
+ /**
+ * Subscribes the user to the given feed
+ *
+ * @param resource $link Database connection
+ * @param string $url Feed URL to subscribe to
+ * @param integer $cat_id Category ID the feed shall be added to
+ * @param string $auth_login (optional) Feed username
+ * @param string $auth_pass (optional) Feed password
+ *
+ * @return integer Status code:
+ * 0 - OK, Feed already exists
+ * 1 - OK, Feed added
+ * 2 - Invalid URL
+ * 3 - URL content is HTML, no feeds available
+ * 4 - URL content is HTML which contains multiple feeds.
+ * Here you should call extractfeedurls in rpc-backend
+ * to get all possible feeds.
+ * 5 - Couldn't download the URL content.
+ */
function subscribe_to_feed($link, $url, $cat_id = 0,
$auth_login = '', $auth_pass = '') {
- $parts = parse_url($url);
-
+ $url = fix_url($url);
if (!validate_feed_url($url)) return 2;
+ if (!fetch_file_contents($url)) return 5;
- if ($parts['scheme'] == 'feed') $parts['scheme'] = 'http';
-
- $url = make_url_from_parts($parts);
+ if (url_is_html($url)) {
+ $feedUrls = get_feeds_from_html($url);
+ if (count($feedUrls) == 0) {
+ return 3;
+ } else if (count($feedUrls) > 1) {
+ return 4;
+ }
+ //use feed url as new URL
+ $url = key($feedUrls);
+ }
if ($cat_id == "0" || !$cat_id) {
$cat_qpart = "NULL";
WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]);
if (db_num_rows($result) == 0) {
-
$result = db_query($link,
"INSERT INTO ttrss_feeds
(owner_uid,feed_url,title,cat_id, auth_login,auth_pass)
while ($line = db_fetch_assoc($result)) {
if ($line["id"] == $default_id) {
- $is_selected = "selected";
+ $is_selected = "selected=\"1\"";
} else {
$is_selected = "";
}
WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
if (db_num_rows($result) > 0 && $include_all_cats) {
- print "<option disabled>--------</option>";
+ print "<option disabled=\"1\">--------</option>";
}
while ($line = db_fetch_assoc($result)) {
if ($line["id"] == $default_id) {
- $is_selected = "selected";
+ $is_selected = "selected=\"1\"";
} else {
- $is_selected = "";
+ $is_selected = "";
}
- printf("<option $is_selected value='%d'>%s</option>",
- $line["id"], htmlspecialchars($line["title"]));
+
+ if ($line["title"])
+ printf("<option $is_selected value='%d'>%s</option>",
+ $line["id"], htmlspecialchars($line["title"]));
}
print "<option value=\"ADD_CAT\">" .__("Add category...") . "</option>";
function make_init_params($link) {
$params = array();
- array_push($params, make_init_param("theme", get_user_theme($link)));
- array_push($params, make_init_param("theme_options", get_user_theme_options($link)));
- array_push($params, make_init_param("daemon_enabled", ENABLE_UPDATE_DAEMON));
- array_push($params, make_init_param("feeds_frame_refresh", FEEDS_FRAME_REFRESH));
-
- array_push($params, make_init_param("sign_progress",
- theme_image($link, "images/indicator_white.gif")));
-
- array_push($params, make_init_param("sign_progress_tiny",
- theme_image($link, "images/indicator_tiny.gif")));
+ $params["theme"] = get_user_theme($link);
+ $params["theme_options"] = get_user_theme_options($link);
+ $params["daemon_enabled"] = ENABLE_UPDATE_DAEMON;
- array_push($params, make_init_param("sign_excl",
- theme_image($link, "images/sign_excl.png")));
-
- array_push($params, make_init_param("sign_info",
- theme_image($link, "images/sign_info.png")));
+ $params["sign_progress"] = theme_image($link, "images/indicator_white.gif");
+ $params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif");
+ $params["sign_excl"] = theme_image($link, "images/sign_excl.png");
+ $params["sign_info"] = theme_image($link, "images/sign_info.png");
foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
"ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
"CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
"HIDE_READ_SHOWS_SPECIAL", "HIDE_FEEDLIST") as $param) {
- array_push($params, make_init_param(strtolower($param),
- (int) get_pref($link, $param)));
+ $params[strtolower($param)] = (int) get_pref($link, $param);
}
- array_push($params, make_init_param("icons_url", ICONS_URL));
+ $params["icons_url"] = ICONS_URL;
+ $params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME;
+ $params["default_view_mode"] = get_pref($link, "_DEFAULT_VIEW_MODE");
+ $params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT");
+ $params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY");
+ $params["prefs_active_tab"] = get_pref($link, "_PREFS_ACTIVE_TAB");
+ $params["infobox_disable_overlay"] = get_pref($link, "_INFOBOX_DISABLE_OVERLAY");
+ $params["bw_limit"] = (int) $_SESSION["bw_limit"];
+ $params["offline_enabled"] = (int) get_pref($link, "ENABLE_OFFLINE_READING");
- array_push($params, make_init_param("cookie_lifetime", SESSION_COOKIE_LIFETIME));
+ $result = db_query($link, "SELECT COUNT(*) AS cf FROM
+ ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
- array_push($params, make_init_param("default_view_mode",
- get_pref($link, "_DEFAULT_VIEW_MODE")));
+ $num_feeds = db_fetch_result($result, 0, "cf");
- array_push($params, make_init_param("default_view_limit",
- (int) get_pref($link, "_DEFAULT_VIEW_LIMIT")));
-
- array_push($params, make_init_param("default_view_order_by",
- get_pref($link, "_DEFAULT_VIEW_ORDER_BY")));
-
- array_push($params, make_init_param("prefs_active_tab",
- get_pref($link, "_PREFS_ACTIVE_TAB")));
-
- array_push($params, make_init_param("infobox_disable_overlay",
- get_pref($link, "_INFOBOX_DISABLE_OVERLAY")));
-
- array_push($params, make_init_param("bw_limit",
- (int) $_SESSION["bw_limit"]));
-
- array_push($params, make_init_param("offline_enabled",
- (int) get_pref($link, "ENABLE_OFFLINE_READING")));
-
- $result = db_query($link, "SELECT COUNT(*) AS cf FROM
- ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
-
- $num_feeds = db_fetch_result($result, 0, "cf");
-
- array_push($params, make_init_param("num_feeds",
- (int) $num_feeds));
-
- array_push($params, make_init_param("collapsed_feedlist",
- (int) get_pref($link, "_COLLAPSED_FEEDLIST")));
+ $params["num_feeds"] = (int) $num_feeds;
+ $params["collapsed_feedlist"] = (int) get_pref($link, "_COLLAPSED_FEEDLIST");
return $params;
}
function print_runtime_info($link) {
- print "<runtime-info>";
+ print "<runtime-info><![CDATA[";
+ print json_encode(make_runtime_info($link));
+ print "]]></runtime-info>";
+ }
+ function make_runtime_info($link) {
$result = db_query($link, "SELECT COUNT(*) AS cf FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
$num_feeds = db_fetch_result($result, 0, "cf");
- print "<param key=\"num_feeds\" value=\"".
- (int)$num_feeds. "\"/>";
+ $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) {
- print "<param key=\"daemon_is_running\" value=\"".
- (int) file_is_locked("update_daemon.lock") . "\"/>";
+
+ $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
if (time() - $_SESSION["daemon_stamp_check"] > 30) {
- $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+ $stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
if ($stamp) {
$stamp_delta = time() - $stamp;
$_SESSION["daemon_stamp_check"] = time();
}
- print "<param key=\"daemon_stamp_ok\" value=\"$stamp_check\"/>";
+ $data['daemon_stamp_ok'] = $stamp_check;
$stamp_fmt = date("Y.m.d, G:i", $stamp);
- print "<param key=\"daemon_stamp\" value=\"$stamp_fmt\"/>";
+ $data['daemon_stamp'] = $stamp_fmt;
}
}
}
if (CHECK_FOR_NEW_VERSION && $_SESSION["access_level"] >= 10) {
if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
- $new_version_details = check_for_update($link);
+ $new_version_details = @check_for_update($link);
print "<param key=\"new_version_available\" value=\"".
sprintf("%d", $new_version_details != ""). "\"/>";
// print "<param key=\"new_version_available\" value=\"1\"/>";
- print "</runtime-info>";
+ return $data;
}
function getSearchSql($search, $match_on) {
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
} else {
- $tmp_result = db_query($link, "SELECT id
- FROM ttrss_feeds WHERE parent_feed = '$feed'
- ORDER BY cat_id,title");
-
- $parent_ids = array();
-
- if (db_num_rows($tmp_result) > 0) {
- while ($p = db_fetch_assoc($tmp_result)) {
- array_push($parent_ids, "feed_id = " . $p["id"]);
- }
-
- $query_strategy_part = sprintf("(feed_id = %d OR %s)",
- $feed, implode(" OR ", $parent_ids));
-
- $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
- } else {
- $query_strategy_part = "feed_id = '$feed'";
- }
+ $query_strategy_part = "feed_id = '$feed'";
}
} else if ($feed == 0 && !$cat_view) { // archive virtual feed
$query_strategy_part = "feed_id IS NULL";
$query_strategy_part = "id > 0"; // dumb
}
+ if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
+ $date_sort_field = "updated";
+ } else {
+ $date_sort_field = "date_entered";
+ }
+
if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
- $order_by = "date_entered";
+ $order_by = "$date_sort_field";
} else {
- $order_by = "date_entered DESC";
+ $order_by = "$date_sort_field DESC";
}
if ($view_mode != "noscores") {
if (!$limit) $limit = 30;
+ if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
+ $date_sort_field = "updated";
+ } else {
+ $date_sort_field = "date_entered";
+ }
+
$qfh_ret = queryFeedHeadlines($link, $feed,
$limit, $view_mode, $is_cat, $search, $search_mode,
- $match_on, "date_entered DESC", 0, $owner_uid);
+ $match_on, "$date_sort_field DESC", 0, $owner_uid);
$result = $qfh_ret[0];
$feed_title = htmlspecialchars($qfh_ret[1]);
} */
- 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);
}
/**
print "Marking affected articles as read...\n";
catchupArticlesById($link, $affected_ids, 0, $line["id"]);
}
-
- db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW()
- WHERE id = " . $line["id"]);
} else {
print "No headlines\n";
}
+
+ db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW()
+ WHERE id = " . $line["id"]);
}
}
return;
}
- error_reporting(0);
if (DEFAULT_UPDATE_METHOD == "1") {
$rss = new SimplePie();
$rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
-// $rss->set_timeout(MAGPIE_FETCH_TIME_OUT);
$rss->set_feed_url($fetch_url);
$rss->set_output_encoding('UTF-8');
$rss->init();
} else {
$rss = fetch_rss($releases_feed);
}
- error_reporting (DEFAULT_ERROR_LEVEL);
if ($rss) {
$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()";
+ $sel_all_link = "javascript:selectArticles('all')";
+ $sel_unread_link = "javascript:selectArticles('unread')";
+ $sel_none_link = "javascript:selectArticles('none')";
+ $sel_inv_link = "javascript:selectArticles('invert')";
- $tog_unread_link = "javascript:selectionToggleUnread()";
- $tog_marked_link = "javascript:selectionToggleMarked()";
- $tog_published_link = "javascript:selectionTogglePublished()";
-
- } else {
-
- $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) {
$search_q = "";
}
+ // Adaptive doesn't really make any sense for generated feeds
+ // All Articles is the default, so no need to insert it either
+ if ($view_mode == "adaptive" || $view_mode == "all_articles")
+ $view_mode = "";
+ else
+ $view_mode = "&view-mode=$view_mode";
+
$rss_link = htmlspecialchars(get_self_url_prefix() .
- "/backend.php?op=rss&id=$feed_id&is_cat=$is_cat&view-mode=$view_mode$search_q");
+ "/backend.php?op=rss&id=$feed_id&is_cat=$is_cat$view_mode$search_q");
#print "
# <a target=\"_blank\"
<a href=\"#\"
title=\"".__("View as RSS feed")."\"
onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">
- <img class=\"noborder\" src=\"images/feed-icon-12x12.png\"></a>";
+ <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/feed-icon-12x12.png\"></a>";
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 " ";
print_labels_headlines_dropdown($link, $feed_id);
print "<li class=\"insensitive\">".__('Feed:')."</li>";
- print "<li onclick=\"window.open('$rss_link')\"> ".__('View as RSS')."</li>";
+ print "<li onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\"> ".__('View as RSS')."</li>";
print "</ul>";
if ($hidden) {
$holder_style = "display:none;";
$ellipsis = "…";
+ $collapse_pic = "cat-uncollapse.png";
} else {
$holder_style = "";
$ellipsis = "";
+ $collapse_pic = "cat-collapse.png";
}
$catctr_class = ($cat_unread > 0) ? "catCtrHasUnread" : "catCtrNoUnread";
print "<li class=\"$cat_class\" id=\"FCAT-$cat_id\">
<img onclick=\"toggleCollapseCat($cat_id)\" class=\"catCollapse\"
title=\"".__('Click to collapse category')."\"
- src=\"images/cat-collapse.png\"><span class=\"$inner_title_class\"
+ src=\"images/$collapse_pic?\"><span class=\"$inner_title_class\"
id=\"FCATN-$cat_id\" $browse_cat_link/>$tmp_category</span>";
print "<span id=\"FCAP-$cat_id\">";
ON
(ttrss_feeds.id = feed_id)
WHERE
- ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL
+ ttrss_feeds.owner_uid = '$owner_uid'
ORDER BY $order_by_qpart";
$result = db_query($link, $query);
$rtl_tag = "";
}
- $tmp_result = db_query($link,
- "SELECT SUM(value) AS unread FROM ttrss_feeds, ttrss_counters_cache
- WHERE parent_feed = '$feed_id' AND feed_id = id");
-
- $unread += db_fetch_result($tmp_result, 0, "unread");
-
$cat_id = $line["cat_id"];
$tmp_category = $line["category"];
if ($memcache && $obj = $memcache->get($obj_id)) {
$tags = $obj;
} else {
- $tmp_result = db_query($link, $query);
+ /* check cache first */
+
+ $result = db_query($link, "SELECT tag_cache FROM ttrss_user_entries
+ WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+
+ $tag_cache = db_fetch_result($result, 0, "tag_cache");
+
+ if ($tag_cache) {
+ $tags = explode(",", $tag_cache);
+ } else {
+
+ /* do it the hard way */
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- array_push($tags, $tmp_line["tag_name"]);
+ $tmp_result = db_query($link, $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($link, "UPDATE ttrss_user_entries
+ SET tag_cache = '$tags_str' WHERE ref_id = '$id'
+ AND owner_uid = " . $_SESSION["uid"]);
}
if ($memcache) $memcache->add($obj_id, $tags, 0, 3600);
$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 $article_content;
-// $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
-// post_id = '$id' AND content_url != ''");
-
- $result = get_article_enclosures($link, $id);
-
-// if (db_num_rows($result) > 0) {
-
- if (count($result) > 0) {
-
- $entries_html = array();
- $entries = array();
-
- //while ($line = db_fetch_assoc($result)) {
- foreach ($result as $line) {
-
- $url = $line["content_url"];
- $ctype = $line["content_type"];
-
- if (!$ctype) $ctype = __("unknown type");
-
- $filename = substr($url, strrpos($url, "/")+1);
-
- $entry = format_inline_player($link, $url, $ctype);
-
- $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
- $filename . " (" . $ctype . ")" . "</a>";
-
- array_push($entries_html, $entry);
-
- $entry = array();
-
- $entry["type"] = $ctype;
- $entry["filename"] = $filename;
- $entry["url"] = $url;
+ print_article_enclosures($link, $id, $always_display_enclosures,
+ $article_content);
- array_push($entries, $entry);
- }
-
- print "<div class=\"postEnclosures\">";
-
- if (!get_pref($link, "STRIP_IMAGES")) {
- if ($always_display_enclosures ||
- !preg_match("/<img/i", $article_content)) {
-
- foreach ($entries as $entry) {
-
- if (preg_match("/image/", $entry["type"]) ||
- preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
-
- print "<p><img
- alt=\"".htmlspecialchars($entry["filename"])."\"
- src=\"" .htmlspecialchars($entry["url"]) . "\"/></p>";
- }
- }
- }
- }
-
- if (db_num_rows($result) == 1) {
- print __("Attachment:") . " ";
- } else {
- print __("Attachments:") . " ";
- }
-
- print join(", ", $entries_html);
-
- print "</div>";
- }
-
print "</div>";
-
+
print "</div>";
}
catchupArticlesById($link, $ids, $cmode);
}
- if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
+ if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0 && !$cat_view) {
update_generic_feed($link, $feed, $cat_view, true);
}
$lnum = $limit*$offset;
- error_reporting (DEFAULT_ERROR_LEVEL);
-
$num_unread = 0;
$cur_feed_title = '';
$labels_str .= format_article_labels($labels, $id);
$labels_str .= "</span>";
- if (count($topmost_article_ids) < 5) {
+ if (count($topmost_article_ids) < 3) {
array_push($topmost_article_ids, $id);
}
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>";
}
$expand_cdm = get_pref($link, 'CDM_EXPANDED');
- $show_excerpt = false;
-
- if ($expand_cdm && $score >= -100) {
- $cdm_cstyle = "";
- $show_excerpt = false;
- } else {
- $cdm_cstyle = "style=\"display : none\"";
- $show_excerpt = true;
- }
$mouseover_attrs = "onmouseover='postMouseIn($id)'
onmouseout='postMouseOut($id)'";
- print "<div class=\"cdmArticle$add_class\"
+ print "<div class=\"$class\"
id=\"RROW-$id\"
$mouseover_attrs'>";
print "<div class=\"cdmHeader\">";
- if (!get_pref($link, "VFEED_GROUP_BY_FEED") || !$line["feed_title"]) {
- $cdm_feed_icon = "<span style=\"cursor : pointer\" onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
- }
+ print "<div style='float : right'>";
+ print "<span class='updated'>$updated_fmt</span>";
+ print "$marked_pic";
+ print "$published_pic";
+ print "$score_pic";
- print "<div class=\"articleUpdated\">$updated_fmt $score_pic $cdm_feed_icon
- </div>";
+ if (!get_pref($link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
+ print "<span style=\"cursor : pointer\"
+ title=\"".htmlspecialchars($line["feed_title"])."\"
+ onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
+ }
+ print "</div>";
+
+ print "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
+ 'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\"/>";
- print "<span id=\"RTITLE-$id\" class=\"titleWrap$hlc_suffix\"><a class=\"title\"
- onclick=\"javascript:toggleUnread($id, 0)\"
+ print "<span id=\"RTITLE-$id\"
+ onclick=\"return cdmExpandArticle($id)\"
+ class=\"titleWrap$hlc_suffix\">
+ <a class=\"title\"
target=\"_blank\" href=\"".$line["link"]."\">".$line["title"]."</a>
- ";
-
- print $entry_author;
-
-/* if (!$expand_cdm || $score < -100) {
- print " <a id=\"CICH-$id\"
- href=\"javascript:cdmExpandArticle($id)\">
- (".__('Show article').")</a>";
- } */
+ </span>";
print $labels_str;
- if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
- if ($line["feed_title"]) {
- print " (<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)";
- }
- }
+ if (!$expand_cdm)
+ $content_hidden = "style=\"display : none\"";
+ else
+ $excerpt_hidden = "style=\"display : none\"";
- print "</span></div>";
+ print "<span $excerpt_hidden
+ onclick=\"return cdmExpandArticle($id)\"
+ id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>";
- if ($show_excerpt) {
- print "<div class=\"cdmExcerpt\" id=\"CEXC-$id\"
- onclick=\"cdmExpandArticle($id)\"
- title=\"".__('Click to expand article')."\">";
+ print "</div>";
- $content_preview = trim(truncate_string(strip_tags($line["content_preview"]), 100));
+ print "<div class=\"cdmContent\" $content_hidden
+ onclick=\"return cdmClicked(event, $id);\"
+ id=\"CICD-$id\">";
- if (strlen($content_preview) != 0) {
- print $content_preview;
- } else {
- print __('Click to expand article');
- }
- print "</div>";
- }
-
- print "<div class=\"cdmContent\"
- onclick=\"cdmClicked($id)\"
- id=\"CICD-$id\" $cdm_cstyle>";
+ print "<div class=\"cdmContentInner\">";
- if ($line["orig_feed_id"]) {
+ if ($line["orig_feed_id"]) {
- $tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds
- WHERE id = ".$line["orig_feed_id"]);
+ $tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds
+ WHERE id = ".$line["orig_feed_id"]);
if (db_num_rows($tmp_result) != 0) {
+
+ print "<div clear='both'>";
+ print __("Originally from:");
+
+ print " ";
+
+ $tmp_line = db_fetch_assoc($tmp_result);
+
+ print "<a target='_blank'
+ href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
+ $tmp_line['title'] . "</a>";
+
+ print " ";
+
+ print "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
+ print "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";
+
+ print "</div>";
+ }
+ }
- print "<div clear='both'>";
- print __("Originally from:");
-
- print " ";
-
- $tmp_line = db_fetch_assoc($tmp_result);
-
- print "<a target='_blank'
- href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
- $tmp_line['title'] . "</a>";
+ // FIXME: make this less of a hack
- print " ";
+ $feed_site_url = false;
- print "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
- print "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";
+ if ($line["feed_id"]) {
+ $tmp_result = db_query($link, "SELECT site_url FROM ttrss_feeds
+ WHERE id = " . $line["feed_id"]);
- print "</div>";
+ if (db_num_rows($tmp_result) == 1) {
+ $feed_site_url = db_fetch_result($tmp_result, 0, "site_url");
+ }
}
- }
-// print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>";
+ $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 "</div>";
- print sanitize_rss($link, $line["content_preview"]);
-
- $article_content = $line["content_preview"];
-
- $e_result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
- post_id = '$id' AND content_url != ''");
-
- if (db_num_rows($e_result) > 0) {
-
- $entries_html = array();
- $entries = array();
-
- while ($e_line = db_fetch_assoc($e_result)) {
-
- $url = $e_line["content_url"];
- $ctype = $e_line["content_type"];
- if (!$ctype) $ctype = __("unknown type");
+ print $article_content;
- $filename = substr($url, strrpos($url, "/")+1);
-
- $entry = format_inline_player($link, $url, $ctype);
-
- $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
- $filename . " (" . $ctype . ")" . "</a>";
-
- array_push($entries_html, $entry);
-
- $entry = array();
-
- $entry["type"] = $ctype;
- $entry["filename"] = $filename;
- $entry["url"] = $url;
-
- array_push($entries, $entry);
- }
-
- $tmp_result = db_query($link, "SELECT always_display_enclosures FROM
- ttrss_feeds WHERE id = ".
+ $tmp_result = db_query($link, "SELECT always_display_enclosures FROM
+ ttrss_feeds WHERE id = ".
(($line['feed_id'] == null) ? $line['orig_feed_id'] :
$line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]);
- $always_display_enclosures = db_fetch_result($tmp_result, 0, "always_display_enclosures");
-
- if (!get_pref($link, "STRIP_IMAGES")) {
- if ($always_display_enclosures ||
- !preg_match("/img/i", $article_content)) {
-
- foreach ($entries as $entry) {
- if (preg_match("/image/", $entry["type"]) ||
- preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
- print "<p><img
- alt=\"".htmlspecialchars($entry["filename"])."\"
- src=\"" .htmlspecialchars($entry["url"]) . "\"></p>";
- }
- }
- }
- }
-
- print "<div class=\"cdmEnclosures\">";
-
- if (db_num_rows($e_result) == 1) {
- print __("Attachment:") . " ";
- } else {
- print __("Attachments:") . " ";
- }
-
- print join(", ", $entries_html);
-
- print "</div>";
- }
-
+ $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result,
+ 0, "always_display_enclosures"));
- print "<br clear='both'>";
-// print "</div>";
-
-/* if (!$expand_cdm) {
- print "<a id=\"CICH-$id\"
- href=\"javascript:cdmExpandArticle($id)\">
- Show article</a>";
- } */
+ print_article_enclosures($link, $id, $always_display_enclosures,
+ $article_content);
print "</div>";
- print "<div class=\"cdmFooter\"><span class='s0'>";
+ print "<div class=\"cdmFooter\">";
+
+ $tags_str = format_tags_string(get_article_tags($link, $id), $id);
- /* print "<div class=\"markedPic\">Star it: $marked_pic</div>"; */
+ print "<img src='".theme_image($link,
+ 'images/tag.png')."' alt='Tags' title='Tags'>
+ <span id=\"ATSTR-$id\">$tags_str</span>
+ <a title=\"".__('Edit tags for this article')."\"
+ href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";
- print __("Select:").
- " <input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
- 'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\">";
+ print "<div style=\"float : right\">";
- print "</span><span class='s1'>$marked_pic ";
- print "$published_pic ";
- print "<img src=\"images/art-zoom.png\" class='tagsPic'
+ print "<img src=\"images/art-zoom.png\"
onclick=\"zoomToArticle($id)\"
style=\"cursor : pointer\"
alt='Zoom'
- title='".__('Show article summary in new window')."'> ";
+ title='".__('Show article summary in new window')."'>";
+
+ if (DIGEST_ENABLE) {
+ print "<img src=\"".theme_image($link, 'images/art-email.png')."\"
+ style=\"cursor : pointer\"
+ onclick=\"emailArticle($id)\"
+ alt='Zoom' title='".__('Forward by email')."'>";
+ }
$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
- print "<img src=\"images/art-pub-note.png\" class='tagsPic'
+ print "<img src=\"images/art-pub-note.png\"
style=\"cursor : pointer\" style=\"cursor : pointer\"
onclick=\"publishWithNote($id, '$note_escaped')\"
alt='PubNote' title='".__('Publish article with a note')."'>";
- print "</span>";
-
- $tags_str = format_tags_string(get_article_tags($link, $id), $id);
-
- print "<span class='s1'>
- <img class='tagsPic' src='".theme_image($link,
- 'images/tag.png')."' alt='Tags' title='Tags'>
- <span id=\"ATSTR-$id\">$tags_str</span>
- <a title=\"".__('Edit tags for this article')."\"
- href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";
+ print "<img src=\"images/digest_checkbox.png\"
+ style=\"cursor : pointer\" style=\"cursor : pointer\"
+ onclick=\"dismissArticle($id)\"
+ alt='Dismiss' title='".__('Dismiss article')."'>";
- print "</span>";
+ print "</div>";
+ print "</div>";
- print "<span class='s2'><a class=\"cdmToggleLink\"
- href=\"javascript:toggleUnread($id)\">
- ".__('toggle unread')."</a></span>";
+ print "</div>";
print "</div>";
- print "</div>";
- }
+ }
++$lnum;
- }
+ }
if (!get_pref($link, 'COMBINED_DISPLAY_MODE') && !$offset) {
print "</table>";
}
}
- 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) {
$url_path = get_self_url_prefix();
$url_path .= "/opml.php?op=publish&key=" .
- get_pref($link, "_PREFS_PUBLISH_KEY", $_SESSION["uid"]);
+ get_feed_access_key($link, 'OPML:Publish', false, $_SESSION["uid"]);
return $url_path;
}
function get_article_labels($link, $id) {
global $memcache;
- $result = db_query($link,
- "SELECT DISTINCT label_id,caption,fg_color,bg_color
- FROM ttrss_labels2, ttrss_user_labels2
- WHERE id = label_id
- AND article_id = '$id'
- AND owner_uid = ".$_SESSION["uid"] . "
- ORDER BY caption");
-
$obj_id = md5("LABELS:$id:" . $_SESSION["uid"]);
$rv = array();
if ($memcache && $obj = $memcache->get($obj_id)) {
return $obj;
} else {
+
+ $result = db_query($link, "SELECT label_cache FROM
+ ttrss_user_entries WHERE ref_id = '$id' AND owner_uid = " .
+ $_SESSION["uid"]);
+
+ $label_cache = db_fetch_result($result, 0, "label_cache");
+
+ if ($label_cache) {
+
+ $label_cache = json_decode($label_cache, true);
+
+ if ($label_cache["no-labels"] == 1)
+ return $rv;
+ else
+ return $label_cache;
+ }
+
+ $result = db_query($link,
+ "SELECT DISTINCT label_id,caption,fg_color,bg_color
+ FROM ttrss_labels2, ttrss_user_labels2
+ WHERE id = label_id
+ AND article_id = '$id'
+ AND owner_uid = ".$_SESSION["uid"] . "
+ ORDER BY caption");
+
while ($line = db_fetch_assoc($result)) {
$rk = array($line["label_id"], $line["caption"], $line["fg_color"],
$line["bg_color"]);
array_push($rv, $rk);
}
if ($memcache) $memcache->add($obj_id, $rv, 0, 3600);
+
+ if (count($rv) > 0)
+ label_update_cache($link, $id, $rv);
+ else
+ label_update_cache($link, $id, array("no-labels" => 1));
}
return $rv;
}
}
+ function label_update_cache($link, $id, $labels = false, $force = false) {
+
+ if ($force)
+ label_clear_cache($link, $id);
+
+ if (!$labels)
+ $labels = get_article_labels($link, $id);
+
+ $labels = db_escape_string(json_encode($labels));
+
+ db_query($link, "UPDATE ttrss_user_entries SET
+ label_cache = '$labels' WHERE ref_id = '$id'");
+
+ }
+
+ function label_clear_cache($link, $id) {
+
+ db_query($link, "UPDATE ttrss_user_entries SET
+ label_cache = '' WHERE ref_id = '$id'");
+
+ }
+
function label_remove_article($link, $id, $label, $owner_uid) {
$label_id = label_find_id($link, $label, $owner_uid);
WHERE
label_id = '$label_id' AND
article_id = '$id'");
+
+ label_clear_cache($link, $id);
}
function label_add_article($link, $id, $label, $owner_uid) {
db_query($link, "INSERT INTO ttrss_user_labels2
(label_id, article_id) VALUES ('$label_id', '$id')");
}
+
+ label_clear_cache($link, $id);
+
}
function label_remove($link, $id, $owner_uid) {
global $memcache;
+ if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+
if ($memcache) {
$obj_id = md5("LABELS:$id:$owner_uid");
$memcache->delete($obj_id);
$caption = db_fetch_result($result, 0, "caption");
$result = db_query($link, "DELETE FROM ttrss_labels2 WHERE id = '$id'
- AND owner_uid = " . $_SESSION["uid"]);
+ AND owner_uid = " . $owner_uid);
if (db_affected_rows($link, $result) != 0 && $caption) {
db_query($link, "UPDATE ttrss_filters SET
enabled = false WHERE action_param = '$caption'
AND action_id = 7
- AND owner_uid = " . $_SESSION["uid"]);
- }
+ AND owner_uid = " . $owner_uid);
+
+ /* Remove cached data */
+
+ db_query($link, "UPDATE ttrss_user_entries SET label_cache = ''
+ WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $owner_uid);
+
+ }
db_query($link, "COMMIT");
}
}
function add_feed_category($link, $feed_cat) {
+
+ if (!$feed_cat) return false;
+
db_query($link, "BEGIN");
$result = db_query($link,
return $url;
}
+ /**
+ * Fixes incomplete URLs by prepending "http://".
+ * Also replaces feed:// with http://, and
+ * prepends a trailing slash if the url is a domain name only.
+ *
+ * @param string $url Possibly incomplete URL
+ *
+ * @return string Fixed URL.
+ */
+ function fix_url($url) {
+ if (strpos($url, '://') === false) {
+ $url = 'http://' . $url;
+ } else if (substr($url, 0, 5) == 'feed:') {
+ $url = 'http:' . substr($url, 5);
+ }
+
+ //prepend slash if the URL has no slash in it
+ // "http://www.example" -> "http://www.example/"
+ if (strpos($url, '/', strpos($url, ':') + 3) === false) {
+ $url .= '/';
+ }
+ return $url;
+ }
+
function validate_feed_url($url) {
$parts = parse_url($url);
}
return false;
}
+
+ /**
+ * Extracts RSS/Atom feed URLs from the given HTML URL.
+ *
+ * @param string $url HTML page URL
+ *
+ * @return array Array of feeds. Key is the full URL, value the title
+ */
+ function get_feeds_from_html($url)
+ {
+ $url = fix_url($url);
+ $baseUrl = substr($url, 0, strrpos($url, '/') + 1);
+
+ libxml_use_internal_errors(true);
+
+ $doc = new DOMDocument();
+ $doc->loadHTMLFile($url);
+ $xpath = new DOMXPath($doc);
+ $entries = $xpath->query('/html/head/link[@rel="alternate"]');
+ $feedUrls = array();
+ foreach ($entries as $entry) {
+ if ($entry->hasAttribute('href')) {
+ $title = $entry->getAttribute('title');
+ if ($title == '') {
+ $title = $entry->getAttribute('type');
+ }
+ $feedUrl = rewrite_relative_url(
+ $baseUrl, $entry->getAttribute('href')
+ );
+ $feedUrls[$feedUrl] = $title;
+ }
+ }
+ return $feedUrls;
+ }
+
+ /**
+ * Checks if the content behind the given URL is a HTML file
+ *
+ * @param string $url URL to check
+ *
+ * @return boolean True if the URL contains HTML content
+ */
+ function url_is_html($url) {
+ $content = substr(fetch_file_contents($url, false), 0, 1000);
+ if (stripos($content, '<html>') === false
+ && stripos($content, '<html ') === false
+ ) {
+ return false;
+ }
+
+ return true;
+ }
+
+ function print_label_select($link, $name, $value, $style = "") {
+
+ $result = db_query($link, "SELECT caption FROM ttrss_labels2
+ WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
+
+ print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
+ "\" style=\"$style\" onchange=\"labelSelectOnChange(this)\" >";
+
+ while ($line = db_fetch_assoc($result)) {
+
+ $issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
+
+ print "<option $issel>" . htmlspecialchars($line["caption"]) . "</option>";
+
+ }
+
+ print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
+
+ print "</select>";
+
+
+ }
+
+ function print_article_enclosures($link, $id, $always_display_enclosures,
+ $article_content) {
+
+ $result = get_article_enclosures($link, $id);
+
+ if (count($result) > 0) {
+
+ $entries_html = array();
+ $entries = array();
+
+ foreach ($result as $line) {
+
+ $url = $line["content_url"];
+ $ctype = $line["content_type"];
+
+ if (!$ctype) $ctype = __("unknown type");
+
+ $filename = substr($url, strrpos($url, "/")+1);
+
+ $entry = format_inline_player($link, $url, $ctype);
+
+ $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
+ $filename . " (" . $ctype . ")" . "</a>";
+
+ array_push($entries_html, $entry);
+
+ $entry = array();
+
+ $entry["type"] = $ctype;
+ $entry["filename"] = $filename;
+ $entry["url"] = $url;
+
+ array_push($entries, $entry);
+ }
+
+ print "<div class=\"postEnclosures\">";
+
+ if (!get_pref($link, "STRIP_IMAGES")) {
+ if ($always_display_enclosures ||
+ !preg_match("/<img/i", $article_content)) {
+
+ foreach ($entries as $entry) {
+
+ if (preg_match("/image/", $entry["type"]) ||
+ preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
+
+ print "<p><img
+ alt=\"".htmlspecialchars($entry["filename"])."\"
+ src=\"" .htmlspecialchars($entry["url"]) . "\"/></p>";
+ }
+ }
+ }
+ }
+
+ if (count($entries) == 1) {
+ print __("Attachment:") . " ";
+ } else {
+ print __("Attachments:") . " ";
+ }
+
+ print join(", ", $entries_html);
+
+ print "</div>";
+ }
+ }
+
+ 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