<?php
-/* if ($_REQUEST["debug"]) {
+ if ($_REQUEST["debug"]) {
define('DEFAULT_ERROR_LEVEL', E_ALL);
- } else {
- define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
- } */
+ }
require_once 'config.php';
if (DB_TYPE == "pgsql") {
/* $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
marked = false AND feed_id = '$feed_id' AND
- (SELECT date_entered FROM ttrss_entries WHERE
+ (SELECT date_updated FROM ttrss_entries WHERE
id = ref_id) < NOW() - INTERVAL '$purge_interval days'"); */
$pg_version = get_pgsql_version($link);
marked = false AND
feed_id = '$feed_id' AND
$query_limit
- ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
+ ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'");
} else {
marked = false AND
feed_id = '$feed_id' AND
$query_limit
- ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
+ ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'");
}
$rows = pg_affected_rows($result);
/* $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
marked = false AND feed_id = '$feed_id' AND
- (SELECT date_entered FROM ttrss_entries WHERE
+ (SELECT date_updated FROM ttrss_entries WHERE
id = ref_id) < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */
$result = db_query($link, "DELETE FROM ttrss_user_entries
marked = false AND
feed_id = '$feed_id' AND
$query_limit
- ttrss_entries.date_entered < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)");
+ ttrss_entries.date_updated < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)");
$rows = mysql_affected_rows($link);
} // function purge_feed
/**
- * Purge old posts from old feeds.
+ * Purge old posts from old feeds. Not used anymore, purging is done after feed update.
*
* @param mixed $link A database connection
* @param boolean $do_output Set to true to enable printed output, false by default.
* @access public
* @return void
*/
- function global_purge_old_posts($link, $do_output = false, $limit = false) {
+ /* function global_purge_old_posts($link, $do_output = false, $limit = false) {
$random_qpart = sql_random_function();
}
}
- // purge orphaned posts in main content table
- $result = db_query($link, "DELETE FROM ttrss_entries WHERE
- (SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
-
- if ($do_output) {
- $rows = db_affected_rows($link, $result);
- _debug("Purged $rows orphaned posts.");
- }
+ purge_orphans($link, $do_output);
- } // function global_purge_old_posts
+ } // function global_purge_old_posts */
function feed_purge_interval($link, $feed_id) {
purge_orphans($link);
}
- function purge_orphans($link) {
+ function purge_orphans($link, $do_output = false) {
+
// purge orphaned posts in main content table
- db_query($link, "DELETE FROM ttrss_entries WHERE
+ $result = db_query($link, "DELETE FROM ttrss_entries WHERE
(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
+
+ if ($do_output) {
+ $rows = db_affected_rows($link, $result);
+ _debug("Purged $rows orphaned posts.");
+ }
}
function get_feed_update_interval($link, $feed_id) {
}
}
- function fetch_file_contents($url) {
+ function fetch_file_contents($url, $type) {
if (USE_CURL_FOR_ICONS) {
- $tmpfile = tempnam(TMP_DIRECTORY, "ttrss-tmp");
-
$ch = curl_init($url);
- $fp = fopen($tmpfile, "w");
- if ($fp) {
- curl_setopt($ch, CURLOPT_FILE, $fp);
- curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
- curl_setopt($ch, CURLOPT_TIMEOUT, 45);
- curl_exec($ch);
-
- if (strpos(curl_getinfo($ch, CURLINFO_CONTENT_TYPE), "image/") !== false) {
- curl_close($ch);
- fclose($fp);
- $contents = file_get_contents($tmpfile);
- } else {
- curl_close($ch);
- fclose($fp);
- }
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 45);
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+ curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
+ curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+ $contents = curl_exec($ch);
+ if ($contents === false) {
+ curl_close($ch);
+ return false;
}
- unlink($tmpfile);
+ $content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+ curl_close($ch);
- return $contents;
+ if ($type && strpos($content_type, "$type") === false) {
+ return false;
+ }
+ return $contents;
} else {
return file_get_contents($url);
}
$icon_file = ICONS_DIR . "/$feed.ico";
if ($favicon_url && !file_exists($icon_file)) {
- $contents = fetch_file_contents($favicon_url);
+ $contents = fetch_file_contents($favicon_url, "image");
- $fp = fopen($icon_file, "w");
+ if ($contents) {
+ $fp = fopen($icon_file, "w");
- if ($fp) {
- fwrite($fp, $contents);
- fclose($fp);
- chmod($icon_file, 0644);
+ if ($fp) {
+ fwrite($fp, $contents);
+ fclose($fp);
+ chmod($icon_file, 0644);
+ }
}
}
}
- function update_rss_feed($link, $feed_url, $feed, $ignore_daemon = false) {
+ function update_rss_feed($link, $feed, $ignore_daemon = false) {
+
+ global $memcache;
+
+ /* Update all feeds with the same URL to utilize memcache */
+
+ if ($memcache) {
+ $result = db_query($link, "SELECT f1.id
+ FROM ttrss_feeds AS f1, ttrss_feeds AS f2
+ WHERE f2.feed_url = f1.feed_url AND f2.id = '$feed'");
+
+ while ($line = db_fetch_assoc($result)) {
+ update_rss_feed_real($link, $line["id"], $ignore_daemon);
+ }
+ } else {
+ update_rss_feed_real($link, $feed, $ignore_daemon);
+ }
+ }
+
+ function update_rss_feed_real($link, $feed, $ignore_daemon = false) {
global $memcache;
} else {
$result = db_query($link, "SELECT id,update_interval,auth_login,
- auth_pass,cache_images,update_method,last_updated
+ feed_url,auth_pass,cache_images,update_method,last_updated
FROM ttrss_feeds WHERE id = '$feed'");
}
if (db_num_rows($result) == 0) {
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND/SKIPPED");
+ _debug("update_rss_feed: feed $feed NOT FOUND/SKIPPED");
}
return false;
}
$auth_login = db_fetch_result($result, 0, "auth_login");
$auth_pass = db_fetch_result($result, 0, "auth_pass");
- if (ALLOW_SELECT_UPDATE_METHOD) {
- if (ENABLE_SIMPLEPIE) {
- $use_simplepie = $update_method != 1;
- } else {
- $use_simplepie = $update_method == 2;
- }
+ if (DEFAULT_UPDATE_METHOD == "1") {
+ $use_simplepie = $update_method != 1;
} else {
- $use_simplepie = ENABLE_SIMPLEPIE;
+ $use_simplepie = $update_method == 2;
}
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
$update_interval = db_fetch_result($result, 0, "update_interval");
$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
+ $fetch_url = db_fetch_result($result, 0, "feed_url");
if ($update_interval < 0) { return; }
$feed = db_escape_string($feed);
- $fetch_url = $feed_url;
-
if ($auth_login && $auth_pass) {
$url_parts = array();
preg_match("/(^[^:]*):\/\/(.*)/", $fetch_url, $url_parts);
error_reporting(0);
}
- if (!$use_simplepie) {
- $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_timeout(10);
- $rss->set_feed_url($fetch_url);
- $rss->set_output_encoding('UTF-8');
-
- if (SIMPLEPIE_CACHE_IMAGES && $cache_images) {
- if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("enabling image cache");
- }
+ $obj_id = md5("FDATA:$use_simplepie:$fetch_url");
- $rss->set_image_handler('./image.php', 'i');
- }
+ if ($memcache && $obj = $memcache->get($obj_id)) {
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("feed update interval (sec): " .
- get_feed_update_interval($link, $feed)*60);
+ _debug("update_rss_feed: data found in memcache.");
}
- if (is_dir(SIMPLEPIE_CACHE_DIR)) {
- $rss->set_cache_location(SIMPLEPIE_CACHE_DIR);
- $rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
+ $rss = $obj;
+
+ } else {
+
+ if (!$use_simplepie) {
+ $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_timeout(10);
+ $rss->set_feed_url($fetch_url);
+ $rss->set_output_encoding('UTF-8');
+
+ if (SIMPLEPIE_CACHE_IMAGES && $cache_images) {
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ _debug("enabling image cache");
+ }
+
+ $rss->set_image_handler('./image.php', 'i');
+ }
+
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ _debug("feed update interval (sec): " .
+ get_feed_update_interval($link, $feed)*60);
+ }
+
+ if (is_dir(SIMPLEPIE_CACHE_DIR)) {
+ $rss->set_cache_location(SIMPLEPIE_CACHE_DIR);
+ $rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
+ }
+
+ $rss->init();
}
- $rss->init();
+ if ($memcache && $rss) $memcache->add($obj_id, $rss, 0, 300);
}
-
// print_r($rss);
$site_url = $rss->channel["link"];
}
- if (get_pref($link, 'ENABLE_FEED_ICONS', $owner_uid, false)) {
- if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("update_rss_feed: checking favicon...");
- }
-
- check_feed_favicon($site_url, $feed, $link);
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ _debug("update_rss_feed: checking favicon...");
}
+ check_feed_favicon($site_url, $feed, $link);
+
if (!$registered_title || $registered_title == "[Unknown]") {
if ($use_simplepie) {
$rss_1_date = $item['dc']['date'];
$atom_date = $item['issued'];
if (!$atom_date) $atom_date = $item['updated'];
-
+
if ($atom_date != "") $entry_timestamp = parse_w3cdtf($atom_date);
if ($rss_1_date != "") $entry_timestamp = parse_w3cdtf($rss_1_date);
if ($rss_2_date != "") $entry_timestamp = strtotime($rss_2_date);
+
}
if ($entry_timestamp == "" || $entry_timestamp == -1 || !$entry_timestamp) {
content,
content_hash,
no_orig_date,
+ date_updated,
date_entered,
comments,
num_comments,
'$entry_content',
'$content_hash',
$no_orig_date,
- NOW(),
+ NOW(),
+ NOW(),
'$entry_comments',
'$num_comments',
'$entry_author')");
} else {
// we keep encountering the entry in feeds, so we need to
- // update date_entered column so that we don't get horrible
+ // update date_updated column so that we don't get horrible
// dupes when the entry gets purged and reinserted again e.g.
// in the case of SLOW SLOW OMG SLOW updating feeds
$base_entry_id = db_fetch_result($result, 0, "id");
- db_query($link, "UPDATE ttrss_entries SET date_entered = NOW()
+ db_query($link, "UPDATE ttrss_entries SET date_updated = NOW()
WHERE id = '$base_entry_id'");
}
$result = db_query($link, "SELECT
id,content_hash,no_orig_date,title,
- ".SUBSTRING_FOR_DATE."(date_entered,1,19) as date_entered,
+ ".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated,
".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
num_comments
FROM
$orig_content_hash = db_fetch_result($result, 0, "content_hash");
$orig_title = db_fetch_result($result, 0, "title");
$orig_num_comments = db_fetch_result($result, 0, "num_comments");
- $orig_date_entered = strtotime(db_fetch_result($result,
- 0, "date_entered"));
+ $orig_date_updated = strtotime(db_fetch_result($result,
+ 0, "date_updated"));
$ref_id = db_fetch_result($result, 0, "id");
$entry_ref_id = $ref_id;
// error_reporting(0);
$article_filters = get_article_filters($filters, $entry_title,
- $entry_content, $entry_link, $entry_timestamp);
+ $entry_content, $entry_link, $entry_timestamp, $entry_author);
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
_debug("update_rss_feed: article filters: ");
# check for manual tags
- $tag_filter = find_article_filter($article_filters, "tag");
+ foreach ($article_filters as $f) {
+ if ($f[0] == "tag") {
- if ($tag_filter) {
+ $manual_tags = trim_array(split(",", $f[1]));
- $manual_tags = trim_array(split(",", $tag_filter[1]));
-
- foreach ($manual_tags as $tag) {
- if (tag_is_valid($tag)) {
- array_push($entry_tags, $tag);
+ foreach ($manual_tags as $tag) {
+ if (tag_is_valid($tag)) {
+ array_push($entry_tags, $tag);
+ }
}
}
}
print "</select>";
}
- function get_article_filters($filters, $title, $content, $link, $timestamp) {
+ function get_article_filters($filters, $title, $content, $link, $timestamp, $author) {
$matches = array();
if ($filters["title"]) {
}
}
+ if ($filters["author"]) {
+ 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))) {
+
+ array_push($matches, array($filter["action"], $filter["action_param"]));
+ }
+ }
+ }
+
return $matches;
}
$link_title = "Updated: $last_updated";
}
- $feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\"
- href=\"javascript:viewfeed('$feed_id', '', false, '', false, 0);\">$feed_title</a>";
+ $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";
print $color_str; */
print "<li id=\"FEEDR-$feed_id\" class=\"$class\">";
- if (get_pref($link, 'ENABLE_FEED_ICONS')) {
- print "$feed_icon";
- }
-
+ print "$feed_icon";
print "<span $rtl_tag id=\"FEEDN-$feed_id\">$feed</span>";
if ($unread != 0) {
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
$_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
+
+ $_SESSION["last_version_check"] = time();
initialize_user_prefs($link, $_SESSION["uid"]);
function initialize_user($link, $uid) {
-/* db_query($link, "INSERT INTO ttrss_labels2 (owner_uid, caption)
- VALUES ('$uid', 'All Articles')");
-
- db_query($link, "INSERT INTO ttrss_filters
- (owner_uid, feed_id, filter_type, reg_exp, enabled,
- action_id, action_param, filter_param)
- VALUES ('$uid', NULL, 1, '.', true, 7, 'All Articles', 'before')"); */
-
db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
values ('$uid', 'Tiny Tiny RSS: New Releases',
'http://tt-rss.org/releases.rss')");
db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
values ('$uid', 'Tiny Tiny RSS: Forum',
- 'http://tt-rss.org/forum/rss.php')");
+ 'http://tt-rss.org/forum/rss.php')");
}
function logout_user() {
function get_user_theme($link) {
- if (get_schema_version($link) >= 63) {
+ if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
$theme_name = get_pref($link, "_THEME_ID");
if (is_dir("themes/$theme_name")) {
return $theme_name;
}
function get_user_theme_path($link) {
+ $theme_path = '';
- if (get_schema_version($link) >= 63) {
+ if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
$theme_name = get_pref($link, "_THEME_ID");
if ($theme_name && is_dir("themes/$theme_name")) {
}
}
}
- return false;
+ return '';
}
function make_lockfile($filename) {
$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
- if (flock($fp, LOCK_EX | LOCK_NB)) {
+ if (flock($fp, LOCK_EX | LOCK_NB)) {
+ if (function_exists('posix_getpid')) {
+ fwrite($fp, posix_getpid() . "\n");
+ }
return $fp;
} else {
return false;
}
}
- function read_stampfile($filename) {
-
- error_reporting(0);
- $fp = fopen(LOCK_DIRECTORY . "/$filename", "r");
- error_reporting (DEFAULT_ERROR_LEVEL);
-
- if ($fp) {
- if (flock($fp, LOCK_EX)) {
- $stamp = fgets($fp);
- flock($fp, LOCK_UN);
- fclose($fp);
- return $stamp;
- } else {
- return false;
- }
- } else {
- return false;
- }
- }
-
function sql_random_function() {
if (DB_TYPE == "mysql") {
return "RAND()";
$cat_qpart = "cat_id IS NULL";
}
- $tmp_result = db_query($link, "SELECT id,feed_url FROM ttrss_feeds
+ $tmp_result = db_query($link, "SELECT id FROM ttrss_feeds
WHERE $cat_qpart AND owner_uid = " . $_SESSION["uid"]);
while ($tmp_line = db_fetch_assoc($tmp_result)) {
- $feed_url = $tmp_line["feed_url"];
$feed_id = $tmp_line["id"];
- update_rss_feed($link, $feed_url, $feed_id, $force_update);
+ update_rss_feed($link, $feed_id, $force_update);
}
} else {
- $tmp_result = db_query($link, "SELECT feed_url FROM ttrss_feeds
- WHERE id = '$feed'");
- $feed_url = db_fetch_result($tmp_result, 0, "feed_url");
- update_rss_feed($link, $feed_url, $feed, $force_update);
+ update_rss_feed($link, $feed, $force_update);
}
}
function getAllCounters($link, $omode = "flc", $active_feed = false) {
if (!$omode) $omode = "flc";
-
- getGlobalCounters($link);
- getVirtCounters($link);
- if (strchr($omode, "l")) getLabelCounters($link);
- if (strchr($omode, "f")) getFeedCounters($link, $active_feed);
- if (strchr($omode, "t")) getTagCounters($link);
+ $data = getGlobalCounters($link);
+
+ $data = array_merge($data, getVirtCounters($link));
+
+ if (strchr($omode, "l")) $data = array_merge($data, getLabelCounters($link));
+ if (strchr($omode, "f")) $data = array_merge($data, getFeedCounters($link, $active_feed));
+ if (strchr($omode, "t")) $data = array_merge($data, getTagCounters($link));
if (strchr($omode, "c")) {
if (get_pref($link, 'ENABLE_FEED_CATS')) {
- getCategoryCounters($link);
+ $data = array_merge($data, getCategoryCounters($link));
}
}
+
+ return $data;
}
function getCategoryCounters($link) {
- # two special categories are -1 and -2 (all virtuals; all labels)
-
-/* $ctr = getCategoryUnread($link, -1);
+ $ret_arr = array();
- print "<counter type=\"category\" id=\"-1\" counter=\"$ctr\"/>"; */
+ /* Labels category */
- $ctr = getCategoryUnread($link, -2);
+ $cv = array("id" => -2, "kind" => "cat",
+ "counter" => getCategoryUnread($link, -2));
- print "<counter type=\"category\" id=\"-2\" counter=\"$ctr\"/>";
+ array_push($ret_arr, $cv);
$age_qpart = getMaxAgeSubquery();
while ($line = db_fetch_assoc($result)) {
$line["cat_id"] = (int) $line["cat_id"];
- print "<counter type=\"category\" id=\"".$line["cat_id"]."\" counter=\"".
- $line["unread"]."\"/>";
+ $cv = array("id" => $line["cat_id"], "kind" => "cat",
+ "counter" => $line["unread"]);
+
+ array_push($ret_arr, $cv);
}
/* Special case: NULL category doesn't actually exist in the DB */
- print "<counter type=\"category\" id=\"0\" counter=\"".
- ccache_find($link, 0, $_SESSION["uid"], true)."\"/>";
+ $cv = array("id" => 0, "kind" => "cat",
+ "counter" => ccache_find($link, 0, $_SESSION["uid"], true));
+
+ array_push($ret_arr, $cv);
+ return $ret_arr;
}
function getCategoryUnread($link, $cat, $owner_uid = false) {
function getMaxAgeSubquery($days = COUNTERS_MAX_AGE) {
if (DB_TYPE == "pgsql") {
- return "ttrss_entries.date_entered >
+ return "ttrss_entries.date_updated >
NOW() - INTERVAL '$days days'";
} else {
- return "ttrss_entries.date_entered >
+ return "ttrss_entries.date_updated >
DATE_SUB(NOW(), INTERVAL $days DAY)";
}
}
return getCategoryUnread($link, $n_feed, $owner_uid);
} if ($feed != "0" && $n_feed == 0) {
+ $feed = db_escape_string($feed);
+
$result = db_query($link, "SELECT SUM((SELECT COUNT(int_id)
FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
AND ref_id = id AND $age_qpart
$feeds_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
} else {
$from_qpart = "ttrss_user_entries,ttrss_entries";
+ $feeds_qpart = '';
}
$query = "SELECT count(int_id) AS unread
}
function getGlobalCounters($link, $global_unread = -1) {
+ $ret_arr = array();
+
if ($global_unread == -1) {
$global_unread = getGlobalUnread($link);
}
- print "<counter type=\"global\" id='global-unread'
- counter='$global_unread'/>";
+
+ $cv = array("id" => "global-unread",
+ "counter" => $global_unread);
+
+ array_push($ret_arr, $cv);
$result = db_query($link, "SELECT COUNT(id) AS fn FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
$subscribed_feeds = db_fetch_result($result, 0, "fn");
- print "<counter type=\"global\" id='subscribed-feeds'
- counter='$subscribed_feeds'/>";
+ $cv = array("id" => "subscribed-feeds",
+ "counter" => $subscribed_feeds);
+
+ array_push($ret_arr, $cv);
+ return $ret_arr;
}
function getSubscribedFeeds($link) {
}
function getTagCounters($link) {
+
+ $ret_arr = array();
$age_qpart = getMaxAgeSubquery();
foreach (array_keys($tags) as $tag) {
$unread = $tags[$tag];
$tag = htmlspecialchars($tag);
- print "<counter type=\"tag\" id=\"$tag\" counter=\"$unread\"/>";
- }
+
+ $cv = array("id" => $tag,
+ "kind" => "tag",
+ "counter" => $unread);
+
+ array_push($ret_arr, $cv);
+ }
+
+ return $ret_arr;
}
- function getVirtCounters($link, $ret_mode = false) {
+ function getVirtCounters($link) {
$ret_arr = array();
for ($i = 0; $i >= -4; $i--) {
$count = getFeedUnread($link, $i);
+
+ $cv = array("id" => $i,
+ "counter" => $count);
- if (!$ret_mode) {
-
- if (get_pref($link, 'EXTENDED_FEEDLIST')) {
- $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $i) . " total)\"";
- } else {
- $xmsg_part = "";
- }
+ if (get_pref($link, 'EXTENDED_FEEDLIST'))
+ $cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
- print "<counter type=\"label\" id=\"$i\" counter=\"$count\" $xmsg_part/>";
- } else {
- $ret_arr[$i]["counter"] = $count;
- $ret_arr[$i]["description"] = getFeedTitle($link, $i);
- }
+ array_push($ret_arr, $cv);
}
return $ret_arr;
}
- function getLabelCounters($link, $ret_mode = false) {
+ function getLabelCounters($link, $descriptions = false) {
+
+ $ret_arr = array();
$age_qpart = getMaxAgeSubquery();
$label_name = $line["caption"];
$count = getFeedUnread($link, $id);
-
- if (!$ret_mode) {
- if (get_pref($link, 'EXTENDED_FEEDLIST')) {
- $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
- } else {
- $xmsg_part = "";
- }
+ $cv = array("id" => $id,
+ "counter" => $count);
- print "<counter type=\"label\" id=\"$id\" counter=\"$count\" $xmsg_part/>";
+ if ($descriptions)
+ $cv["description"] = $label_name;
- } else {
- $ret_arr[$id]["counter"] = $count;
- $ret_arr[$id]["description"] = $label_name;
- }
+ if (get_pref($link, 'EXTENDED_FEEDLIST'))
+ $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
+
+ array_push($ret_arr, $cv);
}
return $ret_arr;
function getFeedCounters($link, $active_feed = false) {
+ $ret_arr = array();
+
$age_qpart = getMaxAgeSubquery();
$query = "SELECT ttrss_feeds.id,
$last_updated = date($short_date, strtotime($line["last_updated"]));
}
- $last_updated = htmlspecialchars($last_updated);
-
$has_img = feed_has_icon($id);
$tmp_result = db_query($link,
$count += db_fetch_result($tmp_result, 0, "unread");
- if ($last_error) {
- $error_part = "error=\"$last_error\"";
- } else {
- $error_part = "";
- }
+ $cv = array("id" => $id,
+ "updated" => $last_updated,
+ "counter" => $count,
+ "has_img" => (int) $has_img);
- if ($has_img) {
- $has_img_part = "hi=\"$has_img\"";
- } else {
- $has_img_part = "";
- }
+ if ($last_error)
+ $cv["error"] = $last_error;
- if ($active_feed && $id == $active_feed) {
- $has_title_part = "title=\"" . htmlspecialchars($line["title"]) . "\"";
- } else {
- $has_title_part = "";
- }
+ if (get_pref($link, 'EXTENDED_FEEDLIST'))
+ $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
- if (get_pref($link, 'EXTENDED_FEEDLIST')) {
- $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
- }
+ if ($active_feed && $id == $active_feed)
+ $cv["title"] = $line["title"];
+
+ array_push($ret_arr, $cv);
- print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $xmsg_part $has_title_part/>";
}
+
+ return $ret_arr;
}
function get_script_dt_add() {
-/* if (strpos(VERSION, ".99") === false) {
- return VERSION;
- } else {
- return time();
- } */
return time();
}
$feed_id = db_fetch_result($result, 0, "id");
if ($feed_id) {
- update_rss_feed($link, $url, $feed_id, true);
+ update_rss_feed($link, $feed_id, true);
}
return 1;
return ((!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME);
}
- function print_init_params($link) {
- print "<init-params>";
- if ($_SESSION["stored-params"]) {
- foreach (array_keys($_SESSION["stored-params"]) as $key) {
- if ($key) {
- $value = htmlspecialchars($_SESSION["stored-params"][$key]);
- print "<param key=\"$key\" value=\"$value\"/>";
- }
- }
- }
-
- print "<param key=\"theme\" value=\"".get_user_theme($link)."\"/>";
- print "<param key=\"theme_options\" value=\"".get_user_theme_options($link)."\"/>";
- print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
- print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
- print "<param key=\"daemon_refresh_only\" value=\"true\"/>";
-
- print "<param key=\"sign_progress\" value=\"".
- theme_image($link, "images/indicator_white.gif")."\"/>";
-
- print "<param key=\"sign_progress_tiny\" value=\"".
- theme_image($link, "images/indicator_tiny.gif")."\"/>";
-
- print "<param key=\"sign_excl\" value=\"".
- theme_image($link, "images/sign_excl.png")."\"/>";
-
- print "<param key=\"sign_info\" value=\"".
- theme_image($link, "images/sign_info.png")."\"/>";
-
- print "<param key=\"on_catchup_show_next_feed\" value=\"" .
- get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
-
- print "<param key=\"hide_read_feeds\" value=\"" .
- (int) get_pref($link, "HIDE_READ_FEEDS") . "\"/>";
-
- print "<param key=\"enable_feed_cats\" value=\"" .
- (int) get_pref($link, "ENABLE_FEED_CATS") . "\"/>";
+ function make_init_param($param, $value) {
+ return array("param" => $param, "value" => $value);
+ }
- print "<param key=\"feeds_sort_by_unread\" value=\"" .
- (int) get_pref($link, "FEEDS_SORT_BY_UNREAD") . "\"/>";
+ function make_init_params($link) {
+ $params = array();
- print "<param key=\"confirm_feed_catchup\" value=\"" .
- (int) get_pref($link, "CONFIRM_FEED_CATCHUP") . "\"/>";
+ 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));
- print "<param key=\"cdm_auto_catchup\" value=\"" .
- (int) get_pref($link, "CDM_AUTO_CATCHUP") . "\"/>";
+ array_push($params, make_init_param("sign_progress",
+ theme_image($link, "images/indicator_white.gif")));
- print "<param key=\"icons_url\" value=\"" . ICONS_URL . "\"/>";
+ array_push($params, make_init_param("sign_progress_tiny",
+ theme_image($link, "images/indicator_tiny.gif")));
- print "<param key=\"cookie_lifetime\" value=\"" . SESSION_COOKIE_LIFETIME . "\"/>";
+ array_push($params, make_init_param("sign_excl",
+ theme_image($link, "images/sign_excl.png")));
- print "<param key=\"default_view_mode\" value=\"" .
- get_pref($link, "_DEFAULT_VIEW_MODE") . "\"/>";
+ array_push($params, make_init_param("sign_info",
+ theme_image($link, "images/sign_info.png")));
- print "<param key=\"default_view_limit\" value=\"" .
- (int) get_pref($link, "_DEFAULT_VIEW_LIMIT") . "\"/>";
+ 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) {
- print "<param key=\"default_view_order_by\" value=\"" .
- get_pref($link, "_DEFAULT_VIEW_ORDER_BY") . "\"/>";
+ array_push($params, make_init_param(strtolower($param),
+ (int) get_pref($link, $param)));
+ }
- print "<param key=\"prefs_active_tab\" value=\"" .
- get_pref($link, "_PREFS_ACTIVE_TAB") . "\"/>";
+ array_push($params, make_init_param("icons_url", ICONS_URL));
- print "<param key=\"infobox_disable_overlay\" value=\"" .
- get_pref($link, "_INFOBOX_DISABLE_OVERLAY") . "\"/>";
+ array_push($params, make_init_param("cookie_lifetime", SESSION_COOKIE_LIFETIME));
- print "<param key=\"icons_location\" value=\"" .
- ICONS_URL . "\"/>";
+ array_push($params, make_init_param("default_view_mode",
+ get_pref($link, "_DEFAULT_VIEW_MODE")));
- print "<param key=\"hide_read_shows_special\" value=\"" .
- (int) get_pref($link, "HIDE_READ_SHOWS_SPECIAL") . "\"/>";
+ array_push($params, make_init_param("default_view_limit",
+ (int) get_pref($link, "_DEFAULT_VIEW_LIMIT")));
- print "<param key=\"hide_feedlist\" value=\"" .
- (int) get_pref($link, "HIDE_FEEDLIST") . "\"/>";
+ array_push($params, make_init_param("default_view_order_by",
+ get_pref($link, "_DEFAULT_VIEW_ORDER_BY")));
- print "<param key=\"bw_limit\" value=\"".
- (int) $_SESSION["bw_limit"]."\"/>";
+ array_push($params, make_init_param("prefs_active_tab",
+ get_pref($link, "_PREFS_ACTIVE_TAB")));
-// print "<param key=\"sync_counters\" value=\"" .
-// (int) get_pref($link, "SYNC_COUNTERS") . "\"/>";
+ array_push($params, make_init_param("infobox_disable_overlay",
+ get_pref($link, "_INFOBOX_DISABLE_OVERLAY")));
- print "<param key=\"sync_counters\" value=\"1\"/>";
+ array_push($params, make_init_param("bw_limit",
+ (int) $_SESSION["bw_limit"]));
- print "<param key=\"offline_enabled\" value=\"".
- (int) get_pref($link, "ENABLE_OFFLINE_READING") . "\"/>";
+ 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");
- print "<param key=\"num_feeds\" value=\"".
- (int)$num_feeds. "\"/>";
+ array_push($params, make_init_param("num_feeds",
+ (int) $num_feeds));
- print "<param key=\"collapsed_feedlist\" value=\"" .
- (int) get_pref($link, "_COLLAPSED_FEEDLIST") . "\"/>";
+ array_push($params, make_init_param("collapsed_feedlist",
+ (int) get_pref($link, "_COLLAPSED_FEEDLIST")));
- print "</init-params>";
+ return $params;
}
function print_runtime_info($link) {
if (time() - $_SESSION["daemon_stamp_check"] > 30) {
- $stamp = (int)read_stampfile("update_daemon.stamp");
-
-// print "<param key=\"daemon_stamp_delta\" value=\"$stamp_delta\"/>";
+ $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
if ($stamp) {
$stamp_delta = time() - $stamp;
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+ $ext_tables_part = "";
+
if ($search) {
$search_query_part = getSearchSql($search, $match_on);
if ($view_mode == "marked") {
$view_query_part = " marked = true AND ";
}
-
+
+ if ($view_mode == "published") {
+ $view_query_part = " published = true AND ";
+ }
+
if ($view_mode == "unread") {
$view_query_part = " unread = true AND ";
}
$query_strategy_part = "feed_id = '$feed'";
}
}
- } else if ($feed == 0) { // starred virtual feed
+ } else if ($feed == 0 && !$cat_view) { // archive virtual feed
$query_strategy_part = "feed_id IS NULL";
+ } else if ($feed == 0 && $cat_view) { // uncategorized
+ $query_strategy_part = "cat_id IS NULL";
+ $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
} else if ($feed == -1) { // starred virtual feed
$query_strategy_part = "marked = true";
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
}
if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
- $order_by = "updated";
+ $order_by = "date_entered";
} else {
- $order_by = "updated DESC";
+ $order_by = "date_entered DESC";
}
if ($view_mode != "noscores") {
}
$query = "SELECT DISTINCT
+ date_entered,
guid,
ttrss_entries.id,ttrss_entries.title,
updated,
FROM
$from_qpart
WHERE
- $group_limit_part
$feed_check_qpart
ttrss_user_entries.ref_id = ttrss_entries.id AND
ttrss_user_entries.owner_uid = '$owner_uid' AND
}
function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat,
- $limit, $search, $search_mode, $match_on) {
+ $limit, $search, $search_mode, $match_on, $view_mode = false) {
$note_style = "float : right; background-color : #fff7d5; border-width : 1px; ".
"padding : 5px; border-style : dashed; border-color : #e7d796;".
if (!$limit) $limit = 30;
$qfh_ret = queryFeedHeadlines($link, $feed,
- $limit, false, $is_cat, $search, $search_mode, $match_on, "updated DESC", 0,
- $owner_uid);
+ $limit, $view_mode, $is_cat, $search, $search_mode,
+ $match_on, "date_entered DESC", 0, $owner_uid);
$result = $qfh_ret[0];
$feed_title = htmlspecialchars($qfh_ret[1]);
$rfc822_date = date('r', strtotime($line["updated"]));
- print "<pubDate>$rfc822_date</pubDate>";
+ print "<pubDate>$rfc822_date</pubDate>";
+
+ if ($line["author"]) {
+ print "<author>" . htmlspecialchars($line["author"]) . "</author>";
+ }
print "<title>" .
htmlspecialchars($line["title"]) . "</title>";
print sanitize_rss($link, $line["content_preview"], false, $owner_uid);
print "]]></description>";
-
+
+ $enclosures = get_article_enclosures($link, $line["id"]);
+
+ foreach ($enclosures as $e) {
+ $type = htmlspecialchars($e['content_type']);
+ $url = htmlspecialchars($e['content_url']);
+ $length = $e['duration'];
+ print "<enclosure url=\"$url\" type=\"$type\" length=\"$length\"/>";
+ }
+
print "</item>";
}
$res = preg_replace('/<img[^>]+>/is', '', $res);
}
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
+ if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
$res = preg_replace("/href=/i", "target=\"_blank\" href=", $res);
}
$affected_ids = array();
if (DB_TYPE == "pgsql") {
- $interval_query = "ttrss_entries.date_entered > NOW() - INTERVAL '$days days'";
+ $interval_query = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
} else if (DB_TYPE == "mysql") {
- $interval_query = "ttrss_entries.date_entered > DATE_SUB(NOW(), INTERVAL $days DAY)";
+ $interval_query = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
}
$result = db_query($link, "SELECT ttrss_entries.title,
ttrss_feeds.title AS feed_title,
- date_entered,
+ date_updated,
ttrss_user_entries.ref_id,
link,
SUBSTRING(content, 1, 120) AS excerpt,
AND $interval_query
AND ttrss_user_entries.owner_uid = $user_id
AND unread = true
- ORDER BY ttrss_feeds.title, date_entered DESC
+ ORDER BY ttrss_feeds.title, date_updated DESC
LIMIT $limit");
$cur_feed_title = "";
}
error_reporting(0);
- if (ENABLE_SIMPLEPIE) {
+ if (DEFAULT_UPDATE_METHOD == "1") {
$rss = new SimplePie();
$rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
// $rss->set_timeout(MAGPIE_FETCH_TIME_OUT);
if ($rss) {
- if (ENABLE_SIMPLEPIE) {
+ if (DEFAULT_UPDATE_METHOD == "1") {
$items = $rss->get_items();
} else {
$items = $rss->items;
$latest_item = $items[0];
- if (ENABLE_SIMPLEPIE) {
+ if (DEFAULT_UPDATE_METHOD == "1") {
$last_title = $latest_item->get_title();
} else {
$last_title = $latest_item["title"];
$latest_version = trim(preg_replace("/(Milestone)|(completed)/", "", $last_title));
- if (ENABLE_SIMPLEPIE) {
+ if (DEFAULT_UPDATE_METHOD == "1") {
$release_url = sanitize_rss($link, $latest_item->get_link());
$content = sanitize_rss($link, $latest_item->get_description());
} else {
function catchupArticlesById($link, $ids, $cmode, $owner_uid = false) {
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+ if (count($ids) == 0) return;
$tmp_ids = array();
function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
$feed_id, $is_cat, $search, $match_on,
- $search_mode) {
+ $search_mode, $view_mode) {
print "<div class=\"headlinesSubToolbar\">";
print "<div id=\"subtoolbar_ftitle\">";
if ($feed_site_url) {
- if (!$bottom) {
- $target = "target=\"_blank\"";
- }
- print "<a $target href=\"$feed_site_url\">".
+ $target = "target=\"_blank\"";
+ print "<a title=\"".__("Visit the website")."\"$target href=\"$feed_site_url\">".
truncate_string($feed_title,30)."</a>";
} else {
if ($feed_id < -10) {
if ($search) {
$search_q = "&q=$search&m=$match_on&smode=$search_mode";
+ } else {
+ $search_q = "";
}
+ $rss_link = "backend.php?op=rss&id=$feed_id&is_cat=$is_cat&view-mode=$view_mode$search_q";
+
print "
- <a target=\"_blank\"
- href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
- <img class=\"noborder\"
- alt=\"".__('Generated feed')."\" src=\"images/feed-icon-12x12.png\">
- </a>";
+ <a target=\"_blank\"
+ title=\"".__("View as RSS feed")."\"
+ href=\"$rss_link\">
+ <img class=\"noborder\" src=\"images/feed-icon-12x12.png\"></a>";
print "</div>";
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 "</ul>";
print "</div>";
}
- function printCategoryHeader($link, $cat_id, $hidden = false, $can_browse = true) {
+ function printCategoryHeader($link, $cat_id, $hidden = false, $can_browse = true,
+ $title_override = false) {
- $tmp_category = getCategoryTitle($link, $cat_id);
+ if (!$title_override)
+ $tmp_category = getCategoryTitle($link, $cat_id);
+ else
+ $tmp_category = $title_override;
if ($cat_id > 0) {
$cat_unread = ccache_find($link, $cat_id, $_SESSION["uid"], true);
}
if (db_num_rows($result) == 0) {
- print "<li>".__('No feeds to display.')."</li>";
+
+ 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>";
+ }
}
} else {
print "<div class=\"postReply\">";
- print "<div class=\"postHeader\" onmouseover=\"enable_resize(true)\"
+ print "<div class=\"postHeader\" onmouseover=\"enable_resize(false)\"
onmouseout=\"enable_resize(false)\">";
$entry_author = $line["author"];
if (!$zoom_mode) {
print "<span id=\"ATSTR-$id\">$tags_str</span>
<a title=\"".__('Edit tags for this article')."\"
- href=\"javascript:editArticleTags($id, $feed_id)\">(+)</a>";
+ href=\"#\" onclick=\"editArticleTags($id, $feed_id)\">(+)</a>";
print "<img src=\"".theme_image($link, 'images/art-zoom.png')."\"
class='tagsPic' style=\"cursor : pointer\" style=\"cursor : pointer\"
onclick=\"publishWithNote($id, '$note_escaped')\"
alt='PubNote' title='".__('Publish article with a note')."'>";
+ if (DIGEST_ENABLE) {
+ print "<img src=\"".theme_image($link, 'images/art-email.png')."\"
+ class='tagsPic' style=\"cursor : pointer\" style=\"cursor : pointer\"
+ onclick=\"emailArticle($id)\"
+ alt='Zoom' title='".__('Forward by email')."'>";
+ }
+
} else {
$tags_str = strip_tags($tags_str);
print "<span id=\"ATSTR-$id\">$tags_str</span>";
print "<div class=\"postEnclosures\">";
if (!get_pref($link, "STRIP_IMAGES")) {
- if ($always_display_enclosures || !preg_match("/<img/i", $article_content)) {
+ if ($always_display_enclosures ||
+ !preg_match("/<img/i", $article_content)) {
+
foreach ($entries as $entry) {
- if (preg_match("/image/", $entry["type"])) {
- print "<p><img
+
+ 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>";
+ src=\"" .htmlspecialchars($entry["url"]) . "\"/></p>";
}
}
}
}
- print "<div class=\"postEnclosures\">";
-
if (db_num_rows($result) == 1) {
print __("Attachment:") . " ";
} else {
catchup_feed($link, $subop_split[1], false);
}
+ // FIXME: might break tag display?
- if ($feed_id > 0) {
+ if ($feed > 0 && !$cat_view) {
$result = db_query($link,
"SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1");
/// START /////////////////////////////////////////////////////////////////////////////////
- $search = db_escape_string($_REQUEST["query"]);
+ @$search = db_escape_string($_REQUEST["query"]);
if ($search) {
$disable_cache = true;
}
- $search_mode = db_escape_string($_REQUEST["search_mode"]);
- $match_on = db_escape_string($_REQUEST["match_on"]);
+ @$search_mode = db_escape_string($_REQUEST["search_mode"]);
+ @$match_on = db_escape_string($_REQUEST["match_on"]);
if (!$match_on) {
$match_on = "both";
}
print_headline_subtoolbar($link, $feed_site_url, $feed_title,
- $feed, $cat_view, $search, $match_on, $search_mode);
+ $feed, $cat_view, $search, $match_on, $search_mode, $view_mode);
print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
}
# $line["feed_title"]."</a>
if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
- if ($line["feed_title"]) {
+ if (@$line["feed_title"]) {
print "<span class=\"hlFeed\">
(<a href=\"javascript:viewfeed($feed_id, '', false)\">".
$line["feed_title"]."</a>)
print "<td class='hlMarkedPic'>$score_pic</td>";
- 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>";
}
}
$tmp_result = db_query($link, "SELECT always_display_enclosures FROM
- ttrss_feeds WHERE id = ".$line['feed_id']." AND owner_uid = ".$_SESSION["uid"]);
+ 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)) {
+ if ($always_display_enclosures ||
+ !preg_match("/img/i", $article_content)) {
+
foreach ($entries as $entry) {
- if (preg_match("/image/", $entry["type"])) {
+ 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>";
return $url_path;
}
+ function opml_publish_url($link){
+ $url_path = "";
+
+
+ if ($_SERVER['HTTPS'] != "on") {
+ $url_path = "http://";
+ } else {
+ $url_path = "https://";
+ }
+
+ $url_path .= $_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
+ $url_path .= "/opml.php?op=publish&key=" .
+ get_pref($link, "_PREFS_PUBLISH_KEY", $_SESSION["uid"]);
+
+ return $url_path;
+ }
/**
* Purge a feed contents, marked articles excepted.
if($debug) _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
- // We setup a alarm to alert if the feed take more than 300s to update.
- // => HANG alarm.
- if(!$from_http && function_exists('pcntl_alarm')) pcntl_alarm(300);
- update_rss_feed($link, $line["feed_url"], $line["id"], true);
- // Cancel the alarm (the update went well)
- if(!$from_http && function_exists('pcntl_alarm')) pcntl_alarm(0);
+ update_rss_feed($link, $line["id"], true);
sleep(1); // prevent flood (FIXME make this an option?)
}
$label_id = $line["id"];
$label_caption = $line["caption"];
+ $id = $line["id"];
if ($feed_id < -10 && $feed_id == -11-$label_id) {
print "<li id=\"LHDL-$id\"
return $rv;
}
+ function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset) {
+
+ $feeds = array();
+
+ /* Labels */
+
+ if ($cat_id == -4 || $cat_id == -2) {
+ $counters = getLabelCounters($link, true);
+
+ foreach (array_values($counters) as $cv) {
+
+ $unread = $cv["counter"];
+
+ if ($unread || !$unread_only) {
+
+ $row = array(
+ "id" => $cv["id"],
+ "title" => $cv["description"],
+ "unread" => $cv["counter"],
+ "cat_id" => -2,
+ );
+
+ array_push($feeds, $row);
+ }
+ }
+ }
+
+ /* Virtual feeds */
+
+ if ($cat_id == -4 || $cat_id == -1) {
+ foreach (array(-1, -2, -3, -4, 0) as $i) {
+ $unread = getFeedUnread($link, $i);
+
+ if ($unread || !$unread_only) {
+ $title = getFeedTitle($link, $i);
+
+ $row = array(
+ "id" => $i,
+ "title" => $title,
+ "unread" => $unread,
+ "cat_id" => -1,
+ );
+ array_push($feeds, $row);
+ }
+
+ }
+ }
+
+ /* Real feeds */
+
+ if ($limit) {
+ $limit_qpart = "LIMIT $limit OFFSET $offset";
+ } else {
+ $limit_qpart = "";
+ }
+
+ if ($cat_id == -4 || $cat_id == -3) {
+ $result = db_query($link, "SELECT
+ id, feed_url, cat_id, title, ".
+ SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+ FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] .
+ " ORDER BY cat_id, title " . $limit_qpart);
+ } else {
+
+ if ($cat_id)
+ $cat_qpart = "cat_id = '$cat_id'";
+ else
+ $cat_qpart = "cat_id IS NULL";
+
+ $result = db_query($link, "SELECT
+ id, feed_url, cat_id, title, ".
+ SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+ FROM ttrss_feeds WHERE
+ $cat_qpart AND owner_uid = " . $_SESSION["uid"] .
+ " ORDER BY cat_id, title " . $limit_qpart);
+ }
+
+ while ($line = db_fetch_assoc($result)) {
+
+ $unread = getFeedUnread($link, $line["id"]);
+
+ $has_icon = feed_has_icon($line['id']);
+
+ if ($unread || !$unread_only) {
+
+ $row = array(
+ "feed_url" => $line["feed_url"],
+ "title" => $line["title"],
+ "id" => (int)$line["id"],
+ "unread" => (int)$unread,
+ "has_icon" => $has_icon,
+ "cat_id" => (int)$line["cat_id"],
+ "last_updated" => strtotime($line["last_updated"])
+ );
+
+ array_push($feeds, $row);
+ }
+ }
+
+ return $feeds;
+ }
+
+ function api_get_headlines($link, $feed_id, $limit, $offset,
+ $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order) {
+
+ /* do not rely on params below */
+
+ $search = db_escape_string($_REQUEST["search"]);
+ $search_mode = db_escape_string($_REQUEST["search_mode"]);
+ $match_on = db_escape_string($_REQUEST["match_on"]);
+
+ $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
+ $view_mode, $is_cat, $search, $search_mode, $match_on,
+ $order, $offset);
+
+ $result = $qfh_ret[0];
+ $feed_title = $qfh_ret[1];
+
+ $headlines = array();
+
+ while ($line = db_fetch_assoc($result)) {
+ $is_updated = ($line["last_read"] == "" &&
+ ($line["unread"] != "t" && $line["unread"] != "1"));
+
+ $headline_row = array(
+ "id" => (int)$line["id"],
+ "unread" => sql_bool_to_bool($line["unread"]),
+ "marked" => sql_bool_to_bool($line["marked"]),
+ "published" => sql_bool_to_bool($line["published"]),
+ "updated" => strtotime($line["updated"]),
+ "is_updated" => $is_updated,
+ "title" => $line["title"],
+ "link" => $line["link"],
+ "feed_id" => $line["feed_id"],
+ "tags" => get_article_tags($link, $line["id"]),
+ );
+
+ if ($show_excerpt) {
+ $excerpt = truncate_string(strip_tags($line["content_preview"]), 100);
+ $headline_row["excerpt"] = $excerpt;
+ }
+
+ if ($show_content) {
+ $headline_row["content"] = $line["content_preview"];
+ }
+
+ array_push($headlines, $headline_row);
+ }
+
+ return $headlines;
+ }
+
+ function generate_dashboard_feed($link) {
+ print "<headlines id=\"-5\" is_cat=\"\">";
+
+ print '<![CDATA[<div id="headlinesContainer">';
+
+ print "<div class='whiteBox'>".__('No feed selected.');
+
+ 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");
+
+ if (get_pref($link, 'HEADLINES_SMART_DATE')) {
+ $last_updated = smart_date_time(strtotime($last_updated));
+ } else {
+ $last_updated = date($short_date, strtotime($last_updated));
+ }
+
+ 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>";
+
+ print "</div>]]>";
+ print "</headlines>";
+
+ print "<headlines-count value=\"0\"/>";
+ print "<vgroup-last-feed value=\"0\"/>";
+ print "<headlines-unread value=\"0\"/>";
+ print "<disable-cache value=\"1\"/>";
+
+ }
+
+ function save_email_address($link, $email) {
+ // FIXME: implement persistent storage of emails
+
+ if (!$_SESSION['stored_emails'])
+ $_SESSION['stored_emails'] = array();
+
+ if (!in_array($email, $_SESSION['stored_emails']))
+ array_push($_SESSION['stored_emails'], $email);
+ }
?>
git.wh0rd.org / tt-rss.git / blobdiff