<?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';
define('SUBSTRING_FOR_DATE', 'SUBSTRING');
}
+ define('THEME_VERSION_REQUIRED', 1.1);
+
/**
* Return available translations names.
*
require_once 'version.php';
require_once 'lib/phpmailer/class.phpmailer.php';
+ require_once 'lib/sphinxapi.php';
- define('MAGPIE_USER_AGENT_EXT', ' (Tiny Tiny RSS/' . VERSION . ')');
+ //define('MAGPIE_USER_AGENT_EXT', ' (Tiny Tiny RSS/' . VERSION . ')');
define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
define('MAGPIE_CACHE_AGE', 60*15); // 15 minutes
+ define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . VERSION . ' (http://tt-rss.org/)');
+ define('MAGPIE_USER_AGENT', SELF_USER_AGENT);
+
+ ini_set('user_agent', SELF_USER_AGENT);
+
require_once "lib/simplepie/simplepie.inc";
require_once "lib/magpierss/rss_fetch.inc";
require_once 'lib/magpierss/rss_utils.inc';
require_once 'lib/htmlpurifier/library/HTMLPurifier.auto.php';
+ $config = HTMLPurifier_Config::createDefault();
+
+ $allowed = "p,a[href],i,em,b,strong,code,pre,blockquote,br,img[src|alt|title],ul,ol,li,h1,h2,h3,h4";
+
+ $config->set('HTML', 'Allowed', $allowed);
+ $purifier = new HTMLPurifier($config);
+
/**
* Print a timestamped debug message.
*
}
}
- 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);
}
$rss = new SimplePie();
- $rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
+ $rss->set_useragent(SELF_USER_AGENT);
# $rss->set_timeout(10);
$rss->set_feed_url($fetch_url);
$rss->set_output_encoding('UTF-8');
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'");
+ $icon_url = substr($icon_url, 0, 250);
+
+ 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']) {
$entry_tags = $entry_tags[1];
$entry_tags = array_merge($entry_tags, $additional_tags);
+ $entry_tags = array_unique($entry_tags);
+
+ for ($i = 0; $i < count($entry_tags); $i++)
+ $entry_tags[$i] = mb_strtolower($entry_tags[$i], 'utf-8');
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
_debug("update_rss_feed: unfiltered tags found:");
$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_tags);
+ $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, tag_cache)
+ 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
'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
$filtered_tags = array();
+ $tags_to_cache = array();
if ($entry_tags && is_array($entry_tags)) {
foreach ($entry_tags as $tag) {
}
}
+ $filtered_tags = array_unique($filtered_tags);
+
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
_debug("update_rss_feed: filtered article tags:");
print_r($filtered_tags);
db_query($link, "BEGIN");
- foreach ($filtered_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");
-
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')");
- }
+ }
- /* update the cache */
+ array_push($tags_to_cache, $tag);
+ }
- $tags_str = db_escape_string(join(",", $filtered_tags));
+ /* 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, "UPDATE ttrss_user_entries
+ SET tag_cache = '$tags_str' WHERE ref_id = '$entry_ref_id'
+ AND owner_uid = $owner_uid");
db_query($link, "COMMIT");
}
foreach ($filters["title"] as $filter) {
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && preg_match("/$reg_exp/i", $title)) ||
- ($inverse && !preg_match("/$reg_exp/i", $title))) {
+ if ((!$inverse && @preg_match("/$reg_exp/i", $title)) ||
+ ($inverse && !@preg_match("/$reg_exp/i", $title))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && preg_match("/$reg_exp/i", $content)) ||
- ($inverse && !preg_match("/$reg_exp/i", $content))) {
+ if ((!$inverse && @preg_match("/$reg_exp/i", $content)) ||
+ ($inverse && !@preg_match("/$reg_exp/i", $content))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
$inverse = $filter["inverse"];
if ($inverse) {
- if (!preg_match("/$reg_exp/i", $title) && !preg_match("/$reg_exp/i", $content)) {
+ if (!@preg_match("/$reg_exp/i", $title) && !preg_match("/$reg_exp/i", $content)) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
} else {
- if (preg_match("/$reg_exp/i", $title) || preg_match("/$reg_exp/i", $content)) {
+ if (@preg_match("/$reg_exp/i", $title) || preg_match("/$reg_exp/i", $content)) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
}
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && preg_match("/$reg_exp/i", $link)) ||
- ($inverse && !preg_match("/$reg_exp/i", $link))) {
+ if ((!$inverse && @preg_match("/$reg_exp/i", $link)) ||
+ ($inverse && !@preg_match("/$reg_exp/i", $link))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
foreach ($filters["author"] as $filter) {
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && preg_match("/$reg_exp/i", $author)) ||
- ($inverse && !preg_match("/$reg_exp/i", $author))) {
+ if ((!$inverse && @preg_match("/$reg_exp/i", $author)) ||
+ ($inverse && !@preg_match("/$reg_exp/i", $author))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && preg_match("/$reg_exp/i", $tag_string)) ||
- ($inverse && !preg_match("/$reg_exp/i", $tag_string))) {
+ if ((!$inverse && @preg_match("/$reg_exp/i", $tag_string)) ||
+ ($inverse && !@preg_match("/$reg_exp/i", $tag_string))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
}
}
}
- function printFeedEntry($feed_id, $class, $feed_title, $unread, $icon_file, $link,
- $rtl_content = false, $last_updated = false, $last_error = false,
- $fg_content = false, $bg_content = false) {
-
- if (!$feed_title) $feed_title = getFeedTitle($link, $feed_id, false);
- if (!$unread) $unread = getFeedUnread($link, $feed_id);
-
- if ($unread > 0) $class .= "Unread";
-
- if (!$icon_file) $icon_file = getFeedIcon($feed_id);
-
- if (strpos($icon_file, "images") !== false) {
- $icon_file = theme_image($link, $icon_file);
- }
-
- if (file_exists($icon_file) && filesize($icon_file) > 0) {
- $feed_icon = "<img id=\"FIMG-$feed_id\" src=\"$icon_file\">";
- } else {
- $feed_icon = "<img id=\"FIMG-$feed_id\" src=\"images/blank_icon.gif\">";
- }
-
- if ($rtl_content) {
- $rtl_tag = "dir=\"rtl\"";
- } else {
- $rtl_tag = "dir=\"ltr\"";
- }
-
- $error_notify_msg = "";
-
- if ($last_error) {
- $link_title = "Error: $last_error ($last_updated)";
- $error_notify_msg = "(Error)";
- } else if ($last_updated) {
- $link_title = "Updated: $last_updated";
- }
-
- $feed = "<span class='feedlink' title=\"$link_title\" id=\"FEEDL-$feed_id\" href=\"#\"
- onclick=\"viewfeed('$feed_id');\">$feed_title</span>";
-
-/* if ($feed_id < -10) {
- $bg_color = "#00ccff";
- $fg_color = "white";
- }
-
- if ($fg_color || $bg_color) {
- $color_str = "<div class='labelColorIndicator'
- style='color : $fg_color; background-color : $bg_color'>l</div>";
- }
-
- print $color_str; */
-
- print "<li id=\"FEEDR-$feed_id\" class=\"$class\">";
- print "$feed_icon";
- print "<span $rtl_tag id=\"FEEDN-$feed_id\">$feed</span>";
-
- if ($unread != 0) {
- $fctr_class = "class=\"feedCtrHasUnread\"";
- } else {
- $fctr_class = "class=\"feedCtrNoUnread\"";
- }
-
- print " <span $rtl_tag $fctr_class id=\"FEEDCTR-$feed_id\">
- (<span id=\"FEEDU-$feed_id\">$unread</span>)</span>";
-
- if (get_pref($link, "EXTENDED_FEEDLIST")) {
- $total = getFeedArticles($link, $feed_id);
- print "<div class=\"feedExtInfo\">
- <span id=\"FLUPD-$feed_id\">$last_updated ($total total) $error_notify_msg</span></div>";
- }
-
- print "</li>";
-
- }
-
function getmicrotime() {
list($usec, $sec) = explode(" ",microtime());
return ((float)$usec + (float)$sec);
$sel .= " value=\"0\"";
}
- print "<input class=\"noborder\"
+ print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
type=\"radio\" $sel $attributes name=\"$id\"> $v ";
}
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 {
$theme_path = '';
}
- return $theme_path;
+ if ($theme_path) {
+ if (is_file("$theme_path/theme.ini")) {
+ $ini = parse_ini_file("$theme_path/theme.ini", true);
+ if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED) {
+ return $theme_path;
+ }
+ }
+ }
+ return '';
}
function get_user_theme_options($link) {
return '';
}
+ function print_theme_includes($link) {
+
+ $t = get_user_theme_path($link);
+ $time = time();
+
+ if ($t) {
+ print "<link rel=\"stylesheet\" type=\"text/css\"
+ href=\"$t/theme.css?$time \">";
+ if (file_exists("$t/theme.js")) {
+ print "<script type=\"text/javascript\" src=\"$t/theme.js?$time\">
+ </script>";
+ }
+ }
+ }
function get_all_themes() {
$themes = glob("themes/*");
foreach ($themes as $t) {
if (is_file("$t/theme.ini")) {
$ini = parse_ini_file("$t/theme.ini", true);
- if ($ini['theme']['version'] && !$ini['theme']['disabled']) {
+ if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED &&
+ !$ini['theme']['disabled']) {
$entry = array();
$entry["path"] = $t;
$entry["base"] = basename($t);
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;
$cv = array("id" => $i,
"counter" => $count);
- if (get_pref($link, 'EXTENDED_FEEDLIST'))
- $cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
+// if (get_pref($link, 'EXTENDED_FEEDLIST'))
+// $cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
array_push($ret_arr, $cv);
}
if ($descriptions)
$cv["description"] = $label_name;
- if (get_pref($link, 'EXTENDED_FEEDLIST'))
- $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
+// if (get_pref($link, 'EXTENDED_FEEDLIST'))
+// $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
array_push($ret_arr, $cv);
}
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");
+ if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
+ $last_updated = '';
$cv = array("id" => $id,
"updated" => $last_updated,
if ($last_error)
$cv["error"] = $last_error;
- if (get_pref($link, 'EXTENDED_FEEDLIST'))
- $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
+// if (get_pref($link, 'EXTENDED_FEEDLIST'))
+// $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
if ($active_feed && $id == $active_feed)
- $cv["title"] = $line["title"];
+ $cv["title"] = truncate_string($line["title"], 30);
array_push($ret_arr, $cv);
* 0 - OK, Feed already exists
* 1 - OK, Feed added
* 2 - Invalid URL
- * 3 - URL content is HTML, not a feed
+ * 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 = '') {
$url = fix_url($url);
if (!validate_feed_url($url)) return 2;
+ if (!fetch_file_contents($url)) return 5;
if (url_is_html($url)) {
$feedUrls = get_feeds_from_html($url);
- if (count($feedUrls) != 1) {
+ if (count($feedUrls) == 0) {
return 3;
+ } else if (count($feedUrls) > 1) {
+ return 4;
}
//use feed url as new URL
$url = key($feedUrls);
$line["id"], htmlspecialchars($line["title"]));
}
- print "<option value=\"ADD_CAT\">" .__("Add category...") . "</option>";
+# print "<option value=\"ADD_CAT\">" .__("Add category...") . "</option>";
print "</select>";
}
return ((!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME);
}
- function make_init_param($param, $value) {
- return array("param" => $param, "value" => $value);
- }
-
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")));
+ $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_progress_tiny",
- theme_image($link, "images/indicator_tiny.gif")));
-
- 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) {
+ "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT",
+ "HIDE_READ_SHOWS_SPECIAL", "HIDE_FEEDLIST", "COMBINED_DISPLAY_MODE") 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));
-
- array_push($params, make_init_param("cookie_lifetime", SESSION_COOKIE_LIFETIME));
-
- array_push($params, make_init_param("default_view_mode",
- get_pref($link, "_DEFAULT_VIEW_MODE")));
-
- 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")));
+ $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");
$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 != ""). "\"/>";
+ $data['new_version_available'] = (int) $new_version_details != "";
$_SESSION["last_version_check"] = time();
}
}
-// print "<param key=\"new_version_available\" value=\"1\"/>";
-
- print "</runtime-info>";
+ return $data;
}
function getSearchSql($search, $match_on) {
$ext_tables_part = "";
if ($search) {
-
- $search_query_part = getSearchSql($search, $match_on);
- $search_query_part .= " AND ";
+
+ if (SPHINX_ENABLED) {
+ $ids = join(",", @sphinx_search($search, 0, 500));
+
+ if ($ids)
+ $search_query_part = "ref_id IN ($ids) AND ";
+ else
+ $search_query_part = "ref_id = -1 AND ";
+
+ } else {
+ $search_query_part = getSearchSql($search, $match_on);
+ $search_query_part .= " AND ";
+ }
} else {
$search_query_part = "";
$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 strip_tags_long($string, $allowed) {
+ function sanitize_rss($link, $str, $force_strip_tags = false, $owner = false, $site_url = false) {
+ global $purifier;
- $config = HTMLPurifier_Config::createDefault();
+ if (!$owner) $owner = $_SESSION["uid"];
- $config->set('HTML', 'Allowed', $allowed);
- $purifier = new HTMLPurifier($config);
+ $res = trim($str); if (!$res) return '';
- return $purifier->purify($string);
+ if (get_pref($link, "STRIP_UNSAFE_TAGS", $owner) || $force_strip_tags) {
+ $res = $purifier->purify($res);
+ }
- }
+ if (get_pref($link, "STRIP_IMAGES", $owner)) {
+ $res = preg_replace('/<img[^>]+>/is', '', $res);
+ }
- // http://ru2.php.net/strip-tags
+ $charset_hack = '<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ </head>';
-/* function strip_tags_long($textstring, $allowed){
- while($textstring != strip_tags($textstring, $allowed))
- {
- while (strlen($textstring) != 0)
- {
- if (strlen($textstring) > 1024) {
- $otherlen = 1024;
- } else {
- $otherlen = strlen($textstring);
- }
- $temptext = strip_tags(substr($textstring,0,$otherlen), $allowed);
- $safetext .= $temptext;
- $textstring = substr_replace($textstring,'',0,$otherlen);
- }
- $textstring = $safetext;
- }
- return $textstring;
-} */
+ $res = trim($res); if (!$res) return '';
+ libxml_use_internal_errors(true);
- function sanitize_rss($link, $str, $force_strip_tags = false, $owner = false) {
- $res = $str;
+ $doc = new DOMDocument();
+ $doc->loadHTML($charset_hack . $res);
+ $xpath = new DOMXPath($doc);
+
+ $entries = $xpath->query('(//a[@href]|//img[@src])');
+ $br_inserted = 0;
- if (!$owner) $owner = $_SESSION["uid"];
+ foreach ($entries as $entry) {
- if (get_pref($link, "STRIP_UNSAFE_TAGS", $owner) || $force_strip_tags) {
+ if ($site_url) {
-// $res = strip_tags_long($res,
-// "<p><a><i><em><b><strong><code><pre><blockquote><br><img><ul><ol><li>");
+ 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')));
+ }
- $res = strip_tags_long($res,
- "p,a[href],i,em,b,strong,code,pre,blockquote,br,img[src|alt|title],ul,ol,li,h1,h2,h3,h4");
+ 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_inserted) {
+ $br = $doc->createElement("br");
- if (get_pref($link, "STRIP_IMAGES", $owner)) {
- $res = preg_replace('/<img[^>]+>/is', '', $res);
- }
+ if ($entry->parentNode->nextSibling) {
+ $entry->parentNode->insertBefore($br, $entry->nextSibling);
+ $br_inserted = 1;
+ }
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
- $res = preg_replace("/href=/i", "target=\"_blank\" href=", $res);
+ }
}
+
+ $node = $doc->getElementsByTagName('body')->item(0);
- return $res;
+ return $doc->saveXML($node);
}
/**
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_useragent(SELF_USER_AGENT);
$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) {
$feed_id, $is_cat, $search, $match_on,
$search_mode, $view_mode) {
- print "<div class=\"headlinesSubToolbar\">";
+# print "<div class=\"headlinesSubToolbar\">";
+
+ $page_prev_link = "viewFeedGoPage(-1)";
+ $page_next_link = "viewFeedGoPage(1)";
+ $page_first_link = "viewFeedGoPage(0)";
+
+ $catchup_page_link = "catchupPage()";
+ $catchup_feed_link = "catchupCurrentFeed()";
+ $catchup_sel_link = "catchupSelection()";
+
+ $archive_sel_link = "archiveSelection()";
+ $delete_sel_link = "deleteSelection()";
+
+ $sel_all_link = "selectArticles('all')";
+ $sel_unread_link = "selectArticles('unread')";
+ $sel_none_link = "selectArticles('none')";
+ $sel_inv_link = "selectArticles('invert')";
+
+ $tog_unread_link = "selectionToggleUnread()";
+ $tog_marked_link = "selectionToggleMarked()";
+ $tog_published_link = "selectionTogglePublished()";
+
+ print "<div id=\"subtoolbar_main\">";
+
+ print __('Select:')."
+ <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 " ";
- $page_prev_link = "javascript:viewFeedGoPage(-1)";
- $page_next_link = "javascript:viewFeedGoPage(1)";
- $page_first_link = "javascript:viewFeedGoPage(0)";
+ print "<select dojoType=\"dijit.form.Select\"
+ onchange=\"headlineActionsChange(this)\">";
+ print "<option value=\"\">".__('Actions...')."</option>";
- $catchup_page_link = "javascript:catchupPage()";
- $catchup_feed_link = "javascript:catchupCurrentFeed()";
- $catchup_sel_link = "javascript:catchupSelection()";
+# print "<optgroup label=\"".__("Selection toggle:")."\">";
- $archive_sel_link = "javascript:archiveSelection()";
- $delete_sel_link = "javascript:deleteSelection()";
+ print "<option value=\"$tog_unread_link\">".__('Toggle unread')."</option>
+ <option value=\"$tog_marked_link\">".__('Toggle starred')."</option>
+ <option value=\"$tog_published_link\">".__('Toggle published')."</option>";
- if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+# print "</optgroup>
+# <optgroup label=\"".__("Selection:")."\">";
- $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()";
+ print "<option>----------</option>";
- $tog_unread_link = "javascript:selectionToggleUnread()";
- $tog_marked_link = "javascript:selectionToggleMarked()";
- $tog_published_link = "javascript:selectionTogglePublished()";
+ print "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>";
+ if ($feed_id != "0") {
+ print "<option value=\"$archive_sel_link\">".__('Archive')."</option>";
} else {
+ print "<option value=\"$archive_sel_link\">".__('Move back')."</option>";
+ print "<option value=\"$delete_sel_link\">".__('Delete')."</option>";
+
+ }
- $sel_all_link = "javascript:cdmSelectArticles('all')";
- $sel_unread_link = "javascript:cdmSelectArticles('unread')";
- $sel_none_link = "javascript:cdmSelectArticles('none')";
+ print "<option value=\"emailArticle(false)\">".__('Forward by email').
+ "</option>";
- $sel_inv_link = "javascript:invertHeadlineSelection()";
+# print "<optgroup label=\"".__("Assign label:")."\">";
+ //print "<option>----------</option>";
+ //print_labels_headlines_dropdown($link, $feed_id);
- $tog_unread_link = "javascript:selectionToggleUnread()";
- $tog_marked_link = "javascript:selectionToggleMarked()";
- $tog_published_link = "javascript:selectionTogglePublished()";
+ print "<option>----------</option>";
- }
+# print "</optgroup>";
+
+ print "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>";
+
+ print "</select>";
+
+ print "</div>";
print "<div id=\"subtoolbar_ftitle\">";
if ($feed_site_url) {
$target = "target=\"_blank\"";
- print "<a title=\"".__("Visit the website")."\"$target href=\"$feed_site_url\">".
+ print "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
truncate_string($feed_title,30)."</a>";
} else {
if ($feed_id < -10) {
print "</div>";
- print __('Select:')."
- <a href=\"$sel_all_link\">".__('All')."</a>,
- <a href=\"$sel_unread_link\">".__('Unread')."</a>,
- <a href=\"$sel_inv_link\">".__('Invert')."</a>,
- <a href=\"$sel_none_link\">".__('None')."</a></li>";
-
- print " ";
-
- print "<span
- onmouseover=\"enable_selection(false)\"
- onmouseout=\"enable_selection(true)\"
- onclick=\"toggleHeadlineActions()\" id=\"headlineActionsDrop\">".
- __("Actions...") . " <img width='11' height'7'
- src=\"images/down_arrow.png\">
- </span>";
-
- print "<ul id=\"headlineActionsBody\" style=\"display : none\">";
-
- print "<li class=\"insensitive\">".__('Selection toggle:')."</li>
- <li onclick=\"$tog_unread_link\"> ".__('Unread')."</li>
- <li onclick=\"$tog_marked_link\"> ".__('Starred')."</li>
- <li onclick=\"$tog_published_link\"> ".__('Published')."</li>
- <li class=\"insensitive\">".__('Selection:')."</li>
- <li onclick=\"$catchup_sel_link\"> ".__('Mark as read')."</li>";
-
-// print "<li onclick=\"$catchup_feed_link\"> ".__('Entire feed').
-// "</li>";
-
- if ($feed_id != "0") {
- print "<li onclick=\"$archive_sel_link\"> ".__('Archive')."</li>";
- } else {
- print "<li onclick=\"$archive_sel_link\"> ".__('Move back')."</li>";
- print "<li onclick=\"$delete_sel_link\"> ".__('Delete')."</li>";
-
- }
-
- print "<li onclick=\"emailArticle(false)\"> ".
- __('Forward by email')."</li>";
-
- //print "<li><span class=\"insensitive\">--------</span></li>";
- print "<li class=\"insensitive\">".__('Assign label:')."</li>";
+ }
+
+ function outputFeedList($link, $special = true) {
- print_labels_headlines_dropdown($link, $feed_id);
+ $feedlist = array();
- print "<li class=\"insensitive\">".__('Feed:')."</li>";
- print "<li onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\"> ".__('View as RSS')."</li>";
+ $enable_cats = get_pref($link, 'ENABLE_FEED_CATS');
- print "</ul>";
+ $feedlist['identifier'] = 'id';
+ $feedlist['label'] = 'name';
+ $feedlist['items'] = array();
- print "</div>";
- }
+ $owner_uid = $_SESSION["uid"];
- function printCategoryHeader($link, $cat_id, $hidden = false, $can_browse = true,
- $title_override = false) {
+ /* virtual feeds */
- if (!$title_override)
- $tmp_category = getCategoryTitle($link, $cat_id);
- else
- $tmp_category = $title_override;
+ if ($special) {
- if ($cat_id > 0) {
- $cat_unread = ccache_find($link, $cat_id, $_SESSION["uid"], true);
- } else if ($cat_id == 0 || $cat_id == -2) {
- $cat_unread = getCategoryUnread($link, $cat_id);
+ if ($enable_cats) {
+ $cat_hidden = get_pref($link, "_COLLAPSED_SPECIAL");
+ $cat = feedlist_init_cat($link, -1, $cat_hidden);
+ } else {
+ $cat['items'] = array();
}
-
- if ($hidden) {
- $holder_style = "display:none;";
- $ellipsis = "…";
+
+ foreach (array(-4, -3, -1, -2, 0) as $i) {
+ array_push($cat['items'], feedlist_init_feed($link, $i));
+ }
+
+ if ($enable_cats) {
+ array_push($feedlist['items'], $cat);
} else {
- $holder_style = "";
- $ellipsis = "";
+ $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
+ }
+
+ $result = db_query($link, "SELECT * FROM
+ ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");
+
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
+ $cat = feedlist_init_cat($link, -2, $cat_hidden);
+ } else {
+ $cat['items'] = array();
}
- $catctr_class = ($cat_unread > 0) ? "catCtrHasUnread" : "catCtrNoUnread";
-
- if ($can_browse) {
- $browse_cat_link = "onclick=\"javascript:viewCategory($cat_id)\"";
- $inner_title_class = "catTitle";
+ while ($line = db_fetch_assoc($result)) {
+
+ $label_id = -$line['id'] - 11;
+ $count = getFeedUnread($link, $label_id);
+
+ array_push($cat['items'], feedlist_init_feed($link, $label_id,
+ false, $count));
+ }
+
+ if ($enable_cats) {
+ array_push($feedlist['items'], $cat);
+ } else {
+ $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
+ }
+ }
+
+/* if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
+ $order_by_qpart = "order_id,category,unread DESC,title";
} else {
- $browse_cat_link = "";
- $inner_title_class = "catTitleNL";
+ $order_by_qpart = "order_id,category,title";
+ }
+ } else {
+ if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
+ $order_by_qpart = "unread DESC,title";
+ } else {
+ $order_by_qpart = "title";
}
+ } */
- $cat_class = "feedCat";
+ /* real feeds */
- 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\"
- id=\"FCATN-$cat_id\" $browse_cat_link/>$tmp_category</span>";
+ if ($enable_cats)
+ $order_by_qpart = "ttrss_feed_categories.order_id,category,
+ ttrss_feeds.order_id,title";
+ else
+ $order_by_qpart = "title";
- print "<span id=\"FCAP-$cat_id\">";
+ $age_qpart = getMaxAgeSubquery();
- print " <span id=\"FCATCTR-$cat_id\"
- class=\"$catctr_class\">($cat_unread)</span> $ellipsis";
+ $query = "SELECT ttrss_feeds.id, ttrss_feeds.title,
+ ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,
+ cat_id,last_error,
+ ttrss_feed_categories.title AS category,
+ ttrss_feed_categories.collapsed,
+ value AS unread
+ FROM ttrss_feeds LEFT JOIN ttrss_feed_categories
+ ON (ttrss_feed_categories.id = cat_id)
+ LEFT JOIN ttrss_counters_cache
+ ON
+ (ttrss_feeds.id = feed_id)
+ WHERE
+ ttrss_feeds.owner_uid = '$owner_uid'
+ ORDER BY $order_by_qpart";
- print "</span>";
+ $result = db_query($link, $query);
- //print "</li>";
+ $actid = $_REQUEST["actid"];
- print "<ul class=\"feedCatList\" id=\"FCATLIST-$cat_id\" style='$holder_style'>";
+ if (db_num_rows($result) > 0) {
- }
+ $category = "";
- function outputFeedList($link, $tags = false) {
-
- print "<ul class=\"feedList\" id=\"feedList\">";
-
- $owner_uid = $_SESSION["uid"];
-
- /* virtual feeds */
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
- $cat_hidden = get_pref($link, "_COLLAPSED_SPECIAL");
-
- printCategoryHeader($link, -1, $cat_hidden, false);
- }
-
- foreach (array(-4, -3, -1, -2, 0) as $i) {
- printFeedEntry($i, "virt", false, false,
- false, $link);
- }
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "</ul></li>";
- }
-
- if (!$tags) {
-
-
- $result = db_query($link, "SELECT * FROM
- ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");
-
- if (db_num_rows($result) > 0) {
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
- $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
-
- printCategoryHeader($link, -2, $cat_hidden, true);
-
- } else {
- print "<li><hr></li>";
- }
- }
-
- while ($line = db_fetch_assoc($result)) {
-
- $label_id = -$line['id'] - 11;
- $count = getFeedUnread($link, $label_id);
-
- printFeedEntry($label_id,
- "label", $line["caption"],
- $count, false, $link,
- false, false, false,
- $line['fg_color'], $line['bg_color']);
-
- }
-
- if (db_num_rows($result) > 0) {
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "</ul>";
- }
- }
-
-
- if (!get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<li><hr></li>";
- }
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
- $order_by_qpart = "order_id,category,unread DESC,title";
- } else {
- $order_by_qpart = "order_id,category,title";
- }
- } else {
- if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
- $order_by_qpart = "unread DESC,title";
- } else {
- $order_by_qpart = "title";
- }
- }
-
- $age_qpart = getMaxAgeSubquery();
-
- $query = "SELECT ttrss_feeds.*,
- ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,
- cat_id,last_error,
- ttrss_feed_categories.title AS category,
- ttrss_feed_categories.collapsed,
- value AS unread
- FROM ttrss_feeds LEFT JOIN ttrss_feed_categories
- ON (ttrss_feed_categories.id = cat_id)
- LEFT JOIN ttrss_counters_cache
- ON
- (ttrss_feeds.id = feed_id)
- WHERE
- ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL
- ORDER BY $order_by_qpart";
-
- $result = db_query($link, $query);
-
- $actid = $_REQUEST["actid"];
-
- /* real feeds */
-
- $lnum = 0;
-
- $total_unread = 0;
-
- $category = "";
+ if (!$enable_cats)
+ $cat['items'] = array();
+ else
+ $cat = false;
while ($line = db_fetch_assoc($result)) {
$feed = htmlspecialchars(trim($line["title"]));
-
+
if (!$feed) $feed = "[Untitled]";
-
+
$feed_id = $line["id"];
$unread = $line["unread"];
- $subop = $_REQUEST["subop"];
-
- $last_updated = make_local_datetime($link, $line['last_updated_noms'],
- false);
-
- $rtl_content = sql_bool_to_bool($line["rtl_content"]);
-
- if ($rtl_content) {
- $rtl_tag = "dir=\"RTL\"";
- } else {
- $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 (!$tmp_category) {
- $tmp_category = __("Uncategorized");
- }
-
- // $class = ($lnum % 2) ? "even" : "odd";
-
- if ($line["last_error"]) {
- $class = "error";
- } else {
- $class = "feed";
- }
-
- if ($actid == $feed_id) {
- $class .= "Selected";
- }
+ if (!$tmp_category) $tmp_category = __("Uncategorized");
- $total_unread += $unread;
-
- if ($category != $tmp_category && get_pref($link, 'ENABLE_FEED_CATS')) {
-
- if ($category) {
- print "</ul></li>";
- }
-
+ if ($category != $tmp_category && $enable_cats) {
+
$category = $tmp_category;
-
+
$collapsed = sql_bool_to_bool($line["collapsed"]);
-
+
// workaround for NULL category
if ($category == __("Uncategorized")) {
$collapsed = get_pref($link, "_COLLAPSED_UNCAT");
}
-
- $cat_id = (int) $cat_id;
-
- printCategoryHeader($link, $cat_id, $collapsed, true);
-
- }
- printFeedEntry($feed_id, $class, $feed, $unread,
- false, $link, $rtl_content,
- $last_updated, $line["last_error"]);
+ if ($cat) array_push($feedlist['items'], $cat);
- ++$lnum;
- }
-
- if (db_num_rows($result) == 0) {
-
- if (!get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<li style='text-align : center'><a href=\"#\"
- onclick=\"quickAddFeed()\">".
- __('Subscribe to feed...')."</a></li>";
- } else {
- printCategoryHeader($link, -1, false, false, "Feeds");
-
- print "<li><a href=\"#\"
- onclick=\"quickAddFeed()\">".
- __('Subscribe to feed...')."</a></li>";
-
- print "</ul>";
+ $cat = feedlist_init_cat($link, $cat_id, $collapsed);
}
- }
-
- } else {
-
- // tags
-
-/* $result = db_query($link, "SELECT tag_name,count(ttrss_entries.id) AS count
- FROM ttrss_tags,ttrss_entries,ttrss_user_entries WHERE
- post_int_id = ttrss_user_entries.int_id AND
- unread = true AND ref_id = ttrss_entries.id
- AND ttrss_tags.owner_uid = '$owner_uid' GROUP BY tag_name
- UNION
- select tag_name,0 as count FROM ttrss_tags WHERE owner_uid = '$owner_uid'
- ORDER BY tag_name"); */
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<li class=\"feedCat\">".__('Tags')."</li>";
- print "<ul class=\"feedCatList\">";
- }
-
- $age_qpart = getMaxAgeSubquery();
-
- $result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id)
- FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
- AND ref_id = id AND $age_qpart
- AND unread = true)) AS count FROM ttrss_tags
- WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name
- ORDER BY count DESC LIMIT 50");
-
- $tags = array();
- while ($line = db_fetch_assoc($result)) {
- $tags[$line["tag_name"]] += $line["count"];
- }
-
- foreach (array_keys($tags) as $tag) {
+ $updated = make_local_datetime($link, $line["updated_noms"], false);
- $unread = $tags[$tag];
- $class = "tag";
-
- printFeedEntry($tag, $class, $tag, $unread, "images/tag.png", $link);
-
- }
-
- if (db_num_rows($result) == 0) {
- print "<li>No tags to display.</li>";
+ array_push($cat['items'], feedlist_init_feed($link, $feed_id,
+ $feed, $unread, $line['last_error'], $updated));
}
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "</ul>";
+
+ if ($enable_cats) {
+ array_push($feedlist['items'], $cat);
+ } else {
+ $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
}
}
- print "</ul>";
-
+ return $feedlist;
}
function get_article_tags($link, $id, $owner_uid = 0) {
$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,
$line = db_fetch_assoc($result);
if ($line["icon_url"]) {
- $feed_icon = "<img class=\"feedIcon\" src=\"" . $line["icon_url"] . "\">";
+ $feed_icon = "<img src=\"" . $line["icon_url"] . "\">";
} else {
$feed_icon = " ";
}
+ $feed_site_url = $line['site_url'];
+
$num_comments = $line["num_comments"];
$entry_comments = "";
</head><body>";
}
+ print "<div id=\"PTITLE-$id\" style=\"display : none\">" .
+ truncate_string(strip_tags($line['title']), 15) . "</div>";
+
+ print "<div class=\"postReply\" id=\"POST-$id\">";
+
+ print "<div dojoType=\"dijit.Menu\" style=\"display: none;\"
+ targetNodeIds=\"POSTHDR-$id\">";
+ print "<div onclick=\"postOpenInNewTab(event, $id)\"
+ dojoType=\"dijit.MenuItem\">".__('View in a new tab')."</div>";
+ print "<div dojoType=\"dijit.MenuSeparator\"></div>";
+ print "<div onclick=\"openArticleInNewWindow($id)\"
+ dojoType=\"dijit.MenuItem\">".__('Open original article')."</div>";
+ print "</div>";
- print "<div class=\"postReply\">";
- print "<div class=\"postHeader\">";
+ print "<div onclick=\"return postClicked(event, $id)\"
+ class=\"postHeader\" id=\"POSTHDR-$id\">";
$entry_author = $line["author"];
print "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
if ($line["link"]) {
- print "<div clear='both'><a target='_blank' href=\"" . $line["link"] . "\">" .
- $line["title"] . "</a><span class='author'>$entry_author</span></div>";
+ print "<div clear='both'><a target='_blank' href=\"" .
+ $line["link"] . "\">" .
+ $line["title"] . "<span class='author'>$entry_author</span></a></div>";
} else {
print "<div clear='both'>" . $line["title"] . "$entry_author</div>";
}
print "<img src=\"".theme_image($link, 'images/art-zoom.png')."\"
class='tagsPic' style=\"cursor : pointer\"
- onclick=\"zoomToArticle($id)\"
- alt='Zoom' title='".__('Show article summary in new window')."'>";
+ onclick=\"postOpenInNewTab(event, $id)\"
+ alt='Zoom' title='".__('Open article in new tab')."'>";
$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
alt='Zoom' title='".__('Forward by email')."'>";
}
+ print "<img src=\"".theme_image($link, 'images/digest_checkbox.png')."\"
+ class='tagsPic' style=\"cursor : pointer\"
+ onclick=\"closeArticlePanel($id)\"
+ alt='Zoom' title='".__('Close this panel')."'>";
+
} else {
$tags_str = strip_tags($tags_str);
print "<span id=\"ATSTR-$id\">$tags_str</span>";
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']) {
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);
}
/// STOP //////////////////////////////////////////////////////////////////////////////////
+ print "<toolbar><![CDATA[";
+
if (!$offset) {
- print "<div id=\"headlinesContainer\" $rtl_tag>";
+// print "<div id=\"headlinesContainer\" $rtl_tag>";
if (!$result) {
print "<div align='center'>".__("Could not display feed (query failed). Please check label match syntax or local configuration.")."</div>";
return;
}
- print_headline_subtoolbar($link, $feed_site_url, $feed_title,
- $feed, $cat_view, $search, $match_on, $search_mode, $view_mode);
+ if (db_num_rows($result) > 0) {
+ print_headline_subtoolbar($link, $feed_site_url, $feed_title,
+ $feed, $cat_view, $search, $match_on, $search_mode, $view_mode);
- print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
+// print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
+
+ }
}
+ print "]]></toolbar><content><![CDATA[";
+
$headlines_count = db_num_rows($result);
if (db_num_rows($result) > 0) {
-# print "\{$offset}";
-
- if (!get_pref($link, 'COMBINED_DISPLAY_MODE') && !$offset) {
- print "<table class=\"headlinesList\" id=\"headlinesList\"
- cellspacing=\"0\">";
- }
-
$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);
}
}
if ($line["unread"] == "t" || $line["unread"] == "1") {
- $class .= "Unread";
+ $class .= " Unread";
++$num_unread;
$is_unread = true;
} else {
$vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
- print "<tr class='feedTitle'><td colspan='7'>".
+ print "<div class='cdmFeedTitle'>".
"<div style=\"float : right\">$feed_icon_img</div>".
- "<a href=\"javascript:viewfeed($feed_id, '', false)\">".
- $line["feed_title"]."</a> $vf_catchup_link</td></tr>";
+ "<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+ $line["feed_title"]."</a> $vf_catchup_link</div>";
+
}
}
$mouseover_attrs = "onmouseover='postMouseIn($id)'
onmouseout='postMouseOut($id)'";
- print "<tr class='$class' id='RROW-$id' $mouseover_attrs>";
-
- print "<td class='hlUpdPic'>$update_pic</td>";
-
- print "<td class='hlSelectRow'>
- <input type=\"checkbox\" onclick=\"tSR(this)\"
- id=\"RCHK-$id\">
- </td>";
-
- print "<td class='hlMarkedPic'>$marked_pic</td>";
- print "<td class='hlMarkedPic'>$published_pic</td>";
+ print "<div class='$class' id='RROW-$id' $mouseover_attrs>";
+
+ print "<div class='hlUpdPic'>$update_pic</div>";
-# 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 "<div class='hlLeft'>";
- print "<td onclick='view($id)' class='hlContent$hlc_suffix' valign='middle' id='HLC-$id'>";
+ print "<input type=\"checkbox\" onclick=\"tSR(this)\"
+ id=\"RCHK-$id\">";
+
+ print "$marked_pic";
+ print "$published_pic";
+
+ print "</div>";
+ print "<div onclick='return hlClicked(event, $id)'
+ class=\"hlTitle\"><span class='hlContent$hlc_suffix'>";
print "<a id=\"RTITLE-$id\"
href=\"" . htmlspecialchars($line["link"]) . "\"
- onclick=\"return false\">" .
+ onclick=\"return false;\">" .
$line["title"];
if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
}
}
- print "</a>";
+ print "</a></span>";
print $labels_str;
-# <a href=\"javascript:viewfeed($feed_id, '', false)\">".
-# $line["feed_title"]."</a>
-
- if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
+ /* if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
if (@$line["feed_title"]) {
print "<span class=\"hlFeed\">
- (<a href=\"javascript:viewfeed($feed_id, '', false)\">".
+ (<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a>)
</span>";
}
- }
+ } */
-// print "<img id='HLL-$id' class='hlLoading'
-// src='images/indicator_tiny.gif' style='display : none'>";
+ print "</div>";
- print "</td>";
-# }
-
- print "<td class=\"hlUpdated\" onclick='view($id)'><nobr>$updated_fmt </nobr></td>";
- print "<td class='hlMarkedPic'>$score_pic</td>";
+ print "<div class=\"hlRight\">";
+ print "<span class=\"hlUpdated\">$updated_fmt</span>";
+ print $score_pic;
+
+ if ($line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
- if (@$line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
- print "<td onclick=\"viewfeed($feed_id)\" class=\"hlFeedIcon\">$feed_icon_img</td>";
+ print "<span onclick=\"viewfeed($feed_id)\"
+ title=\"".htmlspecialchars($line['feed_title'])."\">
+ $feed_icon_img<span>";
}
- print "</tr>";
+ print "</div>";
+ print "</div>";
} else {
print "<div class='cdmFeedTitle'>".
"<div style=\"float : right\">$feed_icon_img</div>".
- "<a href=\"javascript:viewfeed($feed_id, '', false)\">".
+ "<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a> $vf_catchup_link</div>";
}
}
- if ($is_unread) {
- $add_class = "Unread";
- } else {
- $add_class = "";
- }
-
$expand_cdm = get_pref($link, 'CDM_EXPANDED');
$mouseover_attrs = "onmouseover='postMouseIn($id)'
onmouseout='postMouseOut($id)'";
print "<div class=\"$class\"
- id=\"RROW-$id\"
- $mouseover_attrs'>";
+ id=\"RROW-$id\" $mouseover_attrs'>";
print "<div class=\"cdmHeader\">";
print "<div style='float : right'>";
print "<span class='updated'>$updated_fmt</span>";
- print "$marked_pic";
- print "$published_pic";
print "$score_pic";
if (!get_pref($link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
title=\"".htmlspecialchars($line["feed_title"])."\"
onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
}
+ print "<div class=\"updPic\">$update_pic</div>";
+
print "</div>";
-
+
print "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
- 'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\"/>";
+ 'RROW-$id')\" id=\"RCHK-$id\"/>";
+
+ print "$marked_pic";
+ print "$published_pic";
print "<span id=\"RTITLE-$id\"
- onclick=\"return cdmExpandArticle($id)\"
+ onclick=\"return cdmClicked(event, $id);\"
class=\"titleWrap$hlc_suffix\">
<a class=\"title\"
- target=\"_blank\" href=\"".$line["link"]."\">".$line["title"]."</a>
- </span>";
+ target=\"_blank\" href=\"".$line["link"]."\">".$line["title"].
+ " $entry_author</a>";
print $labels_str;
$excerpt_hidden = "style=\"display : none\"";
print "<span $excerpt_hidden
- onclick=\"return cdmExpandArticle($id)\"
id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>";
+ print "</span>";
+
print "</div>";
- print "<div class=\"cdmContent\" $content_hidden
+ print "<div class=\"cdmContent\" $content_hidden
+ onclick=\"return cdmClicked(event, $id);\"
id=\"CICD-$id\">";
print "<div class=\"cdmContentInner\">";
}
}
- $article_content = sanitize_rss($link, $line["content_preview"]);
+ // FIXME: make this less of a hack
+
+ $feed_site_url = false;
+
+ if ($line["feed_id"]) {
+ $tmp_result = db_query($link, "SELECT site_url FROM ttrss_feeds
+ WHERE id = " . $line["feed_id"]);
+
+ if (db_num_rows($tmp_result) == 1) {
+ $feed_site_url = db_fetch_result($tmp_result, 0, "site_url");
+ }
+ }
+
+ if ($expand_cdm) {
+ $article_content = sanitize_rss($link, $line["content_preview"],
+ false, false, $feed_site_url);
+
+ if (!$article_content) $article_content = " ";
+ } else {
+ $article_content = '';
+ }
print "<div id=\"POSTNOTE-$id\">";
if ($line['note']) {
}
print "</div>";
- print $article_content;
+ print "<span id=\"CWRAP-$id\">$article_content</span>";
$tmp_result = db_query($link, "SELECT always_display_enclosures FROM
ttrss_feeds WHERE id = ".
'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>";
+ href=\"#\" onclick=\"editArticleTags($id, $feed_id, true)\">(+)</a>";
print "<div style=\"float : right\">";
print "<img src=\"images/art-zoom.png\"
- onclick=\"zoomToArticle($id)\"
+ onclick=\"zoomToArticle(event, $id)\"
style=\"cursor : pointer\"
alt='Zoom'
- title='".__('Show article summary in new window')."'>";
+ title='".__('Open article in new tab')."'>";
if (DIGEST_ENABLE) {
print "<img src=\"".theme_image($link, 'images/art-email.png')."\"
print "<img src=\"images/digest_checkbox.png\"
style=\"cursor : pointer\" style=\"cursor : pointer\"
- onclick=\"cdmDismissArticle($id)\"
+ onclick=\"dismissArticle($id)\"
alt='Dismiss' title='".__('Dismiss article')."'>";
print "</div>";
++$lnum;
}
- if (!get_pref($link, 'COMBINED_DISPLAY_MODE') && !$offset) {
- print "</table>";
- }
-
} else {
$message = "";
}
}
- if (!$offset) print "<div class='whiteBox'>$message</div>";
- }
+ if (!$offset && $message) {
+ print "<div class='whiteBox'>$message";
- if (!$offset) {
- print "</div>";
- print "</div>";
+ 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) {
+# if ($headlines_count > 0) print "</div>";
+# print "</div>";
+# }
+
+ print "]]></content>";
+
return array($topmost_article_ids, $headlines_count, $feed, $disable_cache, $vgroup_last_feed);
}
// Send feed digests by email if needed.
if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
- purge_orphans($link);
-
} // function update_daemon_common
function sanitize_article_content($text) {
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 print_labels_headlines_dropdown($link, $feed_id) {
- print "<li onclick=\"javascript:addLabel()\">
- ".__("Create label...")."</li>";
+ print "<option value=\"addLabel()\">".__("Create label...")."</option>";
$result = db_query($link, "SELECT id, caption FROM ttrss_labels2 WHERE
owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
$id = $line["id"];
if ($feed_id < -10 && $feed_id == -11-$label_id) {
- print "<li id=\"LHDL-$id\"
- onclick=\"javascript:selectionRemoveLabel($label_id)\">
- $label_caption ".__('(remove)')."</li>";
+ print "<option id=\"LHDL-$id\"
+ value=\"selectionRemoveLabel($label_id)\">".
+ __('Remove:') . " $label_caption</option>";
} else {
- print "<li id=\"LHDL-$id\"
- onclick=\"javascript:selectionAssignLabel($label_id)\">
- $label_caption</li>";
+ print "<option id=\"LHDL-$id\"
+ value=\"selectionAssignLabel($label_id)\">".
+ __('Assign:') . " $label_caption</option>";
}
}
}
return $str;
}
- function toggle_collapse_cat($link, $cat_id) {
+ function toggle_collapse_cat($link, $cat_id, $mode) {
if ($cat_id > 0) {
+ $mode = bool_to_sql_bool($mode);
+
db_query($link, "UPDATE ttrss_feed_categories SET
- collapsed = NOT collapsed WHERE id = '$cat_id' AND owner_uid = " .
+ collapsed = $mode WHERE id = '$cat_id' AND owner_uid = " .
$_SESSION["uid"]);
} else {
$pref_name = '';
}
if ($pref_name) {
- if (get_pref($link, $pref_name)) {
- set_pref($link, $pref_name, 'false');
- } else {
+ if ($mode) {
set_pref($link, $pref_name, 'true');
+ } else {
+ set_pref($link, $pref_name, 'false');
}
}
}
//prepend slash if the URL has no slash in it
// "http://www.example" -> "http://www.example/"
- if (strpos($url, '/', 7) === false) {
+ if (strpos($url, '/', strpos($url, ':') + 3) === false) {
$url .= '/';
}
return $url;
function generate_dashboard_feed($link) {
print "<headlines id=\"-5\" is_cat=\"\">";
- print '<![CDATA[<div id="headlinesContainer">';
+ print "<toolbar><![CDATA[]]></toolbar>";
+
+ print '<content><![CDATA[';
print "<div class='whiteBox'>".__('No feed selected.');
}
print "</span></p>";
- print "</div>]]>";
+ print "]]></content>";
print "</headlines>";
print "<headlines-info><![CDATA[";
$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);
if ($title == '') {
$title = $entry->getAttribute('type');
}
- $feedUrl = $entry->getAttribute('href');
- if (strpos($feedUrl, '://') === false) {
- //no protocol -> relative URL
- $feedUrl = $baseUrl . $feedUrl;
- }
+ $feedUrl = rewrite_relative_url(
+ $baseUrl, $entry->getAttribute('href')
+ );
$feedUrls[$feedUrl] = $title;
}
}
*/
function url_is_html($url) {
$content = substr(fetch_file_contents($url, false), 0, 1000);
- if (strpos($content, '<html>') === false
- && strpos($content, '<html ') === false
+ if (stripos($content, '<html>') === false
+ && stripos($content, '<html ') === false
) {
return false;
}
return true;
}
- function print_label_select($link, $name, $value, $style = "") {
+ function print_label_select($link, $name, $value, $attributes = "") {
$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)\" >";
+ "\" $attributes 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=\"".htmlspecialchars($line["caption"])."\"
+ $issel>" . htmlspecialchars($line["caption"]) . "</option>";
}
- print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
+# print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
print "</select>";
}
}
- if (db_num_rows($result) == 1) {
+ if (count($entries) == 1) {
print __("Attachment:") . " ";
} else {
print __("Attachments:") . " ";
}
}
+ 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);
+ }
+ }
+
+ function sphinx_search($query, $offset = 0, $limit = 30) {
+ $sphinxClient = new SphinxClient();
+
+ $sphinxClient->SetServer('localhost', 9312);
+ $sphinxClient->SetConnectTimeout(1);
+
+ $sphinxClient->SetFieldWeights(array('title' => 70, 'content' => 30,
+ 'feed_title' => 20));
+
+ $sphinxClient->SetMatchMode(SPH_MATCH_EXTENDED2);
+ $sphinxClient->SetRankingMode(SPH_RANK_PROXIMITY_BM25);
+ $sphinxClient->SetLimits($offset, $limit, 1000);
+ $sphinxClient->SetArrayResult(false);
+ $sphinxClient->SetFilter('owner_uid', array($_SESSION['uid']));
+
+ $result = $sphinxClient->Query($query, SPHINX_INDEX);
+
+ $ids = array();
+
+ if (is_array($result['matches'])) {
+ foreach (array_keys($result['matches']) as $int_id) {
+ $ref_id = $result['matches'][$int_id]['attrs']['ref_id'];
+ array_push($ids, $ref_id);
+ }
+ }
+
+ return $ids;
+ }
+
+ function cleanup_tags($link, $days = 14, $limit = 1000) {
+
+ if (DB_TYPE == "pgsql") {
+ $interval_query = "date_updated < NOW() - INTERVAL '$days days'";
+ } else if (DB_TYPE == "mysql") {
+ $interval_query = "date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
+ }
+
+ $tags_deleted = 0;
+
+ while ($limit > 0) {
+ $limit_part = 500;
+
+ $query = "SELECT ttrss_tags.id AS id
+ FROM ttrss_tags, ttrss_user_entries, ttrss_entries
+ WHERE post_int_id = int_id AND $interval_query AND
+ ref_id = ttrss_entries.id AND tag_cache != '' LIMIT $limit_part";
+
+ $result = db_query($link, $query);
+
+ $ids = array();
+
+ while ($line = db_fetch_assoc($result)) {
+ array_push($ids, $line['id']);
+ }
+
+ if (count($ids) > 0) {
+ $ids = join(",", $ids);
+ print ".";
+
+ $tmp_result = db_query($link, "DELETE FROM ttrss_tags WHERE id IN ($ids)");
+ $tags_deleted += db_affected_rows($link, $tmp_result);
+ } else {
+ break;
+ }
+
+ $limit -= $limit_part;
+ }
+
+ print "\n";
+
+ return $tags_deleted;
+ }
+
+ function feedlist_init_cat($link, $cat_id, $hidden = false) {
+ $obj = array();
+ $cat_id = (int) $cat_id;
+
+ if ($cat_id > 0) {
+ $cat_unread = ccache_find($link, $cat_id, $_SESSION["uid"], true);
+ } else if ($cat_id == 0 || $cat_id == -2) {
+ $cat_unread = getCategoryUnread($link, $cat_id);
+ }
+
+ $obj['id'] = 'CAT:' . $cat_id;
+ $obj['items'] = array();
+ $obj['name'] = getCategoryTitle($link, $cat_id);
+ $obj['type'] = 'feed';
+ $obj['unread'] = (int) $cat_unread;
+ $obj['hidden'] = $hidden;
+ $obj['bare_id'] = $cat_id;
+
+ return $obj;
+ }
+
+ function feedlist_init_feed($link, $feed_id, $title = false, $unread = false, $error = '', $updated = '') {
+ $obj = array();
+ $feed_id = (int) $feed_id;
+
+ if (!$title)
+ $title = getFeedTitle($link, $feed_id, false);
+
+ if ($unread === false)
+ $unread = getFeedUnread($link, $feed_id, false);
+
+ $obj['id'] = 'FEED:' . $feed_id;
+ $obj['name'] = $title;
+ $obj['unread'] = (int) $unread;
+ $obj['type'] = 'feed';
+ $obj['error'] = $error;
+ $obj['updated'] = $updated;
+ $obj['icon'] = getFeedIcon($feed_id);
+ $obj['bare_id'] = $feed_id;
+
+ return $obj;
+ }
+
?>