entries into tags
- if (ENABLE_SIMPLEPIE) {
+ if ($use_simplepie) {
$additional_tags = array();
$additional_tags_src = $item->get_categories();
-
+
if (is_array($additional_tags_src)) {
foreach ($additional_tags_src as $tobj) {
array_push($additional_tags, $tobj->get_term());
@@ -867,14 +953,21 @@
if ($t_ctr == 0) {
$additional_tags = false;
- } else if ($t_ctr == 1) {
+ } else if ($t_ctr > 0) {
$additional_tags = array($item['category']);
- } else {
- $additional_tags = array();
+
+ if ($item['category@term']) {
+ array_push($additional_tags, $item['category@term']);
+ }
+
for ($i = 0; $i <= $t_ctr; $i++ ) {
if ($item["category#$i"]) {
array_push($additional_tags, $item["category#$i"]);
}
+
+ if ($item["category#$i@term"]) {
+ array_push($additional_tags, $item["category#$i@term"]);
+ }
}
}
@@ -882,10 +975,9 @@
$t_ctr = $item['dc']['subject#'];
- if ($t_ctr == 1) {
+ if ($t_ctr > 0) {
$additional_tags = array($item['dc']['subject']);
- } else if ($t_ctr > 1) {
- $additional_tags = array();
+
for ($i = 0; $i <= $t_ctr; $i++ ) {
if ($item['dc']["subject#$i"]) {
array_push($additional_tags, $item['dc']["subject#$i"]);
@@ -894,9 +986,49 @@
}
}
+ // enclosures
+
+ $enclosures = array();
+
+ if ($use_simplepie) {
+ $encs = $item->get_enclosures();
+
+ if (is_array($encs)) {
+ foreach ($encs as $e) {
+ $e_item = array(
+ $e->link, $e->type, $e->length);
+
+ array_push($enclosures, $e_item);
+ }
+ }
+
+ } else {
+ $e_ctr = $item['enclosure#'];
+
+ if ($e_ctr > 0) {
+ $e_item = array($item['enclosure@url'],
+ $item['enclosure@type'],
+ $item['enclosure@length']);
+
+ array_push($enclosures, $e_item);
+
+ for ($i = 0; $i <= $e_ctr; $i++ ) {
+
+ if ($item["enclosure#$i@url"]) {
+ $e_item = array($item["enclosure#$i@url"],
+ $item["enclosure#$i@type"],
+ $item["enclosure#$i@length"]);
+ array_push($enclosures, $e_item);
+ }
+ }
+ }
+
+ }
+
# sanitize content
-// $entry_content = sanitize_rss($entry_content);
+ $entry_content = sanitize_article_content($entry_content);
+ $entry_title = sanitize_article_content($entry_title);
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
_debug("update_rss_feed: done collecting data [TITLE:$entry_title]");
@@ -953,13 +1085,16 @@
$result = db_query($link, "SELECT
id,content_hash,no_orig_date,title,
- substring(date_entered,1,19) as date_entered,
- substring(updated,1,19) as updated,
+ ".SUBSTRING_FOR_DATE."(date_entered,1,19) as date_entered,
+ ".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
num_comments
FROM
ttrss_entries
WHERE guid = '$entry_guid'");
+ $entry_ref_id = 0;
+ $entry_int_id = 0;
+
if (db_num_rows($result) == 1) {
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
@@ -974,6 +1109,7 @@
0, "date_entered"));
$ref_id = db_fetch_result($result, 0, "id");
+ $entry_ref_id = $ref_id;
// check for user post link to main table
@@ -1002,8 +1138,14 @@
// error_reporting (DEFAULT_ERROR_LEVEL);
+ $score = calculate_article_score($article_filters);
+
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
+ _debug("update_rss_feed: initial score: $score");
+ }
+
$result = db_query($link,
- "SELECT ref_id FROM ttrss_user_entries WHERE
+ "SELECT ref_id, int_id FROM ttrss_user_entries WHERE
ref_id = '$ref_id' AND owner_uid = '$owner_uid'
$dupcheck_qpart");
@@ -1014,7 +1156,7 @@
_debug("update_rss_feed: user record not found, creating...");
}
- if (!find_article_filter($article_filters, 'catchup')) {
+ if ($score >= -500 && !find_article_filter($article_filters, 'catchup')) {
$unread = 'true';
$last_read_qpart = 'NULL';
} else {
@@ -1022,7 +1164,7 @@
$last_read_qpart = 'NOW()';
}
- if (find_article_filter($article_filters, 'mark')) {
+ if (find_article_filter($article_filters, 'mark') || $score > 1000) {
$marked = 'true';
} else {
$marked = 'false';
@@ -1036,11 +1178,28 @@
$result = db_query($link,
"INSERT INTO ttrss_user_entries
- (ref_id, owner_uid, feed_id, unread, last_read, marked, published)
+ (ref_id, owner_uid, feed_id, unread, last_read, marked,
+ published, score)
VALUES ('$ref_id', '$owner_uid', '$feed', $unread,
- $last_read_qpart, $marked, $published)");
+ $last_read_qpart, $marked, $published, '$score')");
+
+ $result = db_query($link,
+ "SELECT int_id FROM ttrss_user_entries WHERE
+ ref_id = '$ref_id' AND owner_uid = '$owner_uid' AND
+ feed_id = '$feed' LIMIT 1");
+
+ if (db_num_rows($result) == 1) {
+ $entry_int_id = db_fetch_result($result, 0, "int_id");
+ }
+ } else {
+ $entry_ref_id = db_fetch_result($result, 0, "ref_id");
+ $entry_int_id = db_fetch_result($result, 0, "int_id");
}
-
+
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
+ _debug("update_rss_feed: RID: $entry_ref_id, IID: $entry_int_id");
+ }
+
$post_needs_update = false;
if (get_pref($link, "UPDATE_POST_ON_CHECKSUM_CHANGE", $owner_uid, false) &&
@@ -1092,6 +1251,33 @@
db_query($link, "COMMIT");
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
+ _debug("update_rss_feed: looking for enclosures...");
+ }
+
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
+ print_r($enclosures);
+ }
+
+ db_query($link, "BEGIN");
+
+ foreach ($enclosures as $enc) {
+ $enc_url = db_escape_string($enc[0]);
+ $enc_type = db_escape_string($enc[1]);
+ $enc_dur = db_escape_string($enc[2]);
+
+ $result = db_query($link, "SELECT id FROM ttrss_enclosures
+ WHERE content_url = '$enc_url' AND post_id = '$entry_ref_id'");
+
+ if (db_num_rows($result) == 0) {
+ db_query($link, "INSERT INTO ttrss_enclosures
+ (content_url, content_type, title, duration, post_id) VALUES
+ ('$enc_url', '$enc_type', '', '$enc_dur', '$entry_ref_id')");
+ }
+ }
+
+ db_query($link, "COMMIT");
+
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
_debug("update_rss_feed: looking for tags...");
}
@@ -1147,17 +1333,6 @@
db_query($link, "BEGIN");
- $result = db_query($link, "SELECT id,int_id
- FROM ttrss_entries,ttrss_user_entries
- WHERE guid = '$entry_guid'
- AND feed_id = '$feed' AND ref_id = id
- AND owner_uid = '$owner_uid'");
-
- if (db_num_rows($result) == 1) {
-
- $entry_id = db_fetch_result($result, 0, "id");
- $entry_int_id = db_fetch_result($result, 0, "int_id");
-
foreach ($entry_tags as $tag) {
$tag = sanitize_tag($tag);
@@ -1178,7 +1353,7 @@
VALUES ('$owner_uid','$tag', '$entry_int_id')");
}
}
- }
+
db_query($link, "COMMIT");
}
@@ -1194,7 +1369,7 @@
} else {
- if (ENABLE_SIMPLEPIE) {
+ if ($use_simplepie) {
$error_msg = mb_substr($rss->error(), 0, 250);
} else {
$error_msg = mb_substr(magpie_error(), 0, 250);
@@ -1211,7 +1386,7 @@
last_updated = NOW() WHERE id = '$feed'");
}
- if (ENABLE_SIMPLEPIE) {
+ if ($use_simplepie) {
unset($rss);
}
@@ -1319,6 +1494,18 @@
return false;
}
+ function calculate_article_score($filters) {
+ $score = 0;
+
+ foreach ($filters as $f) {
+ if ($f[0] == "score") {
+ $score += $f[1];
+ };
+ }
+ return $score;
+ }
+
+
function printFeedEntry($feed_id, $class, $feed_title, $unread, $icon_file, $link,
$rtl_content = false, $last_updated = false, $last_error = false) {
@@ -1471,10 +1658,15 @@
$pwd_hash1 = encrypt_password($password);
$pwd_hash2 = encrypt_password($password, $login);
- if ($force_auth && defined('_DEBUG_USER_SWITCH')) {
+ if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH
+ && $_SERVER["REMOTE_USER"]) {
+
+ $login = db_escape_string($_SERVER["REMOTE_USER"]);
+
$query = "SELECT id,login,access_level
FROM ttrss_users WHERE
- login = '$login'";
+ login = '$login'";
+
} else {
$query = "SELECT id,login,access_level,pwd_hash
FROM ttrss_users WHERE
@@ -1761,7 +1953,7 @@
function file_is_locked($filename) {
if (function_exists('flock')) {
error_reporting(0);
- $fp = fopen($filename, "r");
+ $fp = fopen(LOCK_DIRECTORY . "/$filename", "r");
error_reporting(DEFAULT_ERROR_LEVEL);
if ($fp) {
if (flock($fp, LOCK_EX | LOCK_NB)) {
@@ -1771,13 +1963,15 @@
}
fclose($fp);
return true;
+ } else {
+ return false;
}
}
- return false;
+ return true; // consider the file always locked and skip the test
}
function make_lockfile($filename) {
- $fp = fopen($filename, "w");
+ $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
if (flock($fp, LOCK_EX | LOCK_NB)) {
return $fp;
@@ -1787,7 +1981,7 @@
}
function make_stampfile($filename) {
- $fp = fopen($filename, "w");
+ $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
if (flock($fp, LOCK_EX | LOCK_NB)) {
fwrite($fp, time() . "\n");
@@ -1802,14 +1996,18 @@
function read_stampfile($filename) {
error_reporting(0);
- $fp = fopen($filename, "r");
+ $fp = fopen(LOCK_DIRECTORY . "/$filename", "r");
error_reporting (DEFAULT_ERROR_LEVEL);
- if (flock($fp, LOCK_EX)) {
- $stamp = fgets($fp);
- flock($fp, LOCK_UN);
- fclose($fp);
- return $stamp;
+ if ($fp) {
+ if (flock($fp, LOCK_EX)) {
+ $stamp = fgets($fp);
+ flock($fp, LOCK_UN);
+ fclose($fp);
+ return $stamp;
+ } else {
+ return false;
+ }
} else {
return false;
}
@@ -2415,7 +2613,7 @@
$old_counters = $_SESSION["fctr_last_value"];
/* $result = db_query($link, "SELECT id,last_error,parent_feed,
- SUBSTRING(last_updated,1,19) AS last_updated,
+ ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated,
(SELECT count(id)
FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND
@@ -2426,7 +2624,7 @@
$query = "SELECT ttrss_feeds.id,
ttrss_feeds.title,
- SUBSTRING(ttrss_feeds.last_updated,1,19) AS last_updated,
+ ".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
last_error,
COUNT(ttrss_entries.id) AS count
FROM ttrss_feeds
@@ -2668,7 +2866,7 @@
} else if ($id == -3) {
return __("Fresh articles");
} else if ($id < -10) {
- $label_id = -10 - $id;
+ $label_id = -$id - 11;
$result = db_query($link, "SELECT description FROM ttrss_labels WHERE id = '$label_id'");
if (db_num_rows($result) == 1) {
return db_fetch_result($result, 0, "description");
@@ -2743,6 +2941,12 @@
print "
- ";
+ } */
- } else {
- // old style subtoolbar:
-
- print "".
- __('Select:')."
- ".__('All')." ,
- ".__('Unread')." ,
- ".__('None')."
- ".
- __('Toggle:')." ".__('Unread')." ,
- ".__('Starred')."
- ".
- __('Mark as read:')."
- ".__('Page')." ,
- ".__('Feed')." ";
+ print " ".__('Entire feed')." ";
+
+ print "-------- ".__('Other actions:')."
+ ".__('Search to label')." ";
+ } else {
+ print " ".__('Search to label')."
- ".__('Convert to label')." ";
}
+
+ print "";
+ print " ";
+
+ } else {
+ // old style subtoolbar:
+
+ print "".
+ __('Select:')."
+ ".__('All')." ,
+ ".__('Unread')." ,
+ ".__('None')."
+ ".
+ __('Toggle:')." ".__('Unread')." ,
+ ".__('Starred')."
+ ".
+ __('Mark as read:')."
+ ".__('Page')." ,
+ ".__('Feed')." ";
+
+ if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
+
+ print "
+
+ ".__('Convert to label')." ";
+ }
+
+ print " ";
+
+ }
+ } else { // dashboard menu actions
- print "";
-
+ // not implemented
+ print "";
}
-/* if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
- print "
-
- ".__('Convert to Label')." ";
-} */
-
print "";
- print "";
+ print "Search: ";
+
+ print "";
if ($feed_site_url) {
if (!$bottom) {
@@ -3722,17 +3964,19 @@
print " [$user_page_offset] ";
}
- print " ";
-
- if (!$bottom) {
+ if (!$bottom && !$disable_feed) {
print "
";
+ } else if ($feed_small_icon) {
+ print " ";
+
print " ";
print "";
@@ -3808,6 +4052,11 @@
printCategoryHeader($link, -1, $cat_hidden, false);
}
+ if (defined('_ENABLE_DASHBOARD')) {
+ printFeedEntry(-4, "virt", __("Dashboard"), 0,
+ "images/tag.png", $link);
+ }
+
$num_starred = getFeedUnread($link, -1);
$num_published = getFeedUnread($link, -2);
$num_fresh = getFeedUnread($link, -3);
@@ -3923,7 +4172,7 @@
$age_qpart = getMaxAgeSubquery();
$result = db_query($link, "SELECT ttrss_feeds.*,
- SUBSTRING(last_updated,1,19) AS last_updated_noms,
+ ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,
(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND unread = true
AND $age_qpart
@@ -4058,7 +4307,7 @@
}
printFeedEntry($feed_id, $class, $feed, $unread,
- ICONS_DIR."/$feed_id.ico", $link, $rtl_content,
+ ICONS_URL."/$feed_id.ico", $link, $rtl_content,
$last_updated, $line["last_error"]);
++$lnum;
@@ -4255,7 +4504,7 @@
}
$result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
- SUBSTRING(updated,1,16) as updated,
+ ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
num_comments,
author
@@ -4307,7 +4556,7 @@
$entry_author = $line["author"];
if ($entry_author) {
- $entry_author = __(" - by ") . $entry_author;
+ $entry_author = __(" - ") . $entry_author;
}
$parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
@@ -4384,7 +4633,43 @@
$line["content"] = preg_replace("/href=/i", "target=\"_new\" href=", $line["content"]);
}
- print $line["content"] . "";
+ print $line["content"];
+
+ $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
+ post_id = '$id' AND content_url != ''");
+
+ if (db_num_rows($result) > 0) {
+ print "";
+
+ if (db_num_rows($result) == 1) {
+ print __("Attachment:") . " ";
+ } else {
+ print __("Attachments:") . " ";
+ }
+
+ $entries = array();
+
+ while ($line = db_fetch_assoc($result)) {
+
+ $url = $line["content_url"];
+ $ctype = $line["content_type"];
+
+ if (!$ctype) $ctype = __("unknown type");
+
+ $filename = substr($url, strrpos($url, "/")+1);
+
+ $entry = "
" .
+ $filename . " (" . $ctype . ")" . " ";
+
+ array_push($entries, $entry);
+ }
+
+ print join(", ", $entries);
+
+ print "
mark as read )";
+
+ print "".
+ "".
+ $line["feed_title"]." $vf_catchup_link: ";
@@ -4628,9 +4962,9 @@
# truncate_string($line["feed_title"],30)." ";
# } else {
- print "";
+ print " ";
- print "" .
+ print " " .
$line["title"];
if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
@@ -4644,11 +4978,13 @@
# ".
# $line["feed_title"]."
- if ($line["feed_title"]) {
- print "
- (".
- $line["feed_title"]." )
- ";
+ if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
+ if ($line["feed_title"]) {
+ print "
+ (".
+ $line["feed_title"]." )
+ ";
+ }
}
@@ -4656,12 +4992,28 @@
# }
- print " $updated_fmt $updated_fmt $score_pic ";
+
print " ";
} else {
-
+
+ if (get_pref($link, 'VFEED_GROUP_BY_FEED')) {
+ if ($feed_id != $vgroup_last_feed) {
+
+ $cur_feed_title = $line["feed_title"];
+ $vgroup_last_feed = $feed_id;
+
+ $vf_catchup_link = "(mark as read )";
+
+ print "";
+ }
+ }
+
if ($is_unread) {
$add_class = "Unread";
} else {
@@ -4670,7 +5022,7 @@
$expand_cdm = get_pref($link, 'CDM_EXPANDED');
- if ($expand_cdm) {
+ if ($expand_cdm && $score >= -100) {
$cdm_cstyle = "";
} else {
$cdm_cstyle = "style=\"display : none\"";
@@ -4678,30 +5030,34 @@
print "";
print "";
+
+ print "
".$line["title"]." ";
+ target=\"_blank\" href=\"".$line["link"]."\">".$line["title"]."
+ ";
print $entry_author;
- if (!$expand_cdm) {
+ if (!$expand_cdm || $score < -100) {
print "
(".__('Show article').") ";
}
- if ($line["feed_title"]) {
- print " (".$line["feed_title"]." )";
+ if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
+ if ($line["feed_title"]) {
+ print " (".$line["feed_title"]." )";
+ }
}
- print "";
// print "
";
+
print $line["content_preview"];
+
+ $e_result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
+ post_id = '$id' AND content_url != ''");
+
+ if (db_num_rows($e_result) > 0) {
+ print "
";
+
+ if (db_num_rows($e_result) == 1) {
+ print __("Attachment:") . " ";
+ } else {
+ print __("Attachments:") . " ";
+ }
+
+ $entries = array();
+
+ while ($e_line = db_fetch_assoc($e_result)) {
+
+ $url = $e_line["content_url"];
+ $ctype = $e_line["content_type"];
+ if (!$ctype) $ctype = __("unknown type");
+
+ $filename = substr($url, strrpos($url, "/")+1);
+
+ $entry = "
" .
+ $filename . " (" . $ctype . ")" . " ";
+
+ array_push($entries, $entry);
+ }
+
+ print join(", ", $entries);
+
+ print "
";
+ }
+
print "
";
// print "
";
@@ -4790,7 +5181,20 @@
} else {
- if (!$offset) print "
".__('No articles found.')."
";
+ $message = "";
+
+ switch ($view_mode) {
+ case "unread":
+ $message = __("No unread articles found to display.");
+ break;
+ case "marked":
+ $message = __("No starred articles found to display.");
+ break;
+ default:
+ $message = __("No articles found to display.");
+ }
+
+ if (!$offset) print "
$message
";
}
if (!$offset) {
@@ -4798,7 +5202,7 @@
print "
";
+
+ print_headline_subtoolbar($link, "", "Dashboard",
+ false, false, -4, false, false, false,
+ false, 0, 0, true, true, "tag.png");
+
+ print "
";
+ print "
There is 666 unread articles in 666 feeds.
";
+ print "
";
+
+ print "
";
+ print "";
+ print "";
+
+ print "";
+ print " ";
+ }
+
+ function sanitize_article_content($text) {
+ # we don't support CDATA sections in articles, they break our own escaping
+ $text = preg_replace("/\[\[CDATA/", "", $text);
+ $text = preg_replace("/\]\]\>/", "", $text);
+ return $text;
+ }
+
+ function load_filters($link, $feed, $owner_uid, $action_id = false) {
+ $filters = array();
+
+ if ($action_id) $ftype_query_part = "action_id = '$action_id' AND";
+
+ $result = db_query($link, "SELECT reg_exp,
+ ttrss_filter_types.name AS name,
+ ttrss_filter_actions.name AS action,
+ inverse,
+ action_param
+ FROM ttrss_filters,ttrss_filter_types,ttrss_filter_actions WHERE
+ enabled = true AND
+ $ftype_query_part
+ owner_uid = $owner_uid AND
+ ttrss_filter_types.id = filter_type AND
+ ttrss_filter_actions.id = action_id AND
+ (feed_id IS NULL OR feed_id = '$feed') ORDER BY reg_exp");
+
+ while ($line = db_fetch_assoc($result)) {
+ if (!$filters[$line["name"]]) $filters[$line["name"]] = array();
+ $filter["reg_exp"] = $line["reg_exp"];
+ $filter["action"] = $line["action"];
+ $filter["action_param"] = $line["action_param"];
+ $filter["inverse"] = sql_bool_to_bool($line["inverse"]);
+
+ array_push($filters[$line["name"]], $filter);
+ }
+
+ return $filters;
+ }
+
+ function get_score_pic($score) {
+ if ($score > 0) {
+ return "score_high.png";
+ } else if ($score < 0) {
+ return "score_low.png";
+ } else {
+ return "score_neutral.png";
+ }
+ }
+
+ function rounded_table_start($classname, $header = " ") {
+ print "";
+ print " $header ";
+ }
+
+ function rounded_table_end($footer = " ") {
+ print " $footer
";
}
?>
![\"".__('Generated](\"images/feed-icon-12x12.png\"){kind=icon}
";
+ } else if ($feed_small_icon) {
+ print "