summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/colors.php10
-rw-r--r--include/errorhandler.php6
-rw-r--r--include/functions.php60
-rw-r--r--include/rssfuncs.php123
-rw-r--r--include/version.php2
5 files changed, 74 insertions, 127 deletions
diff --git a/include/colors.php b/include/colors.php
index 7cf1a6af0..41bf7b819 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -237,16 +237,16 @@ function rgb2hsl($arr) {
} else {
$s = $del_Max / $var_Max;
- $del_R = ((($max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
- $del_G = ((($max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
- $del_B = ((($max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+ $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+ $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+ $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
if ($var_R == $var_Max) $h = $del_B - $del_G;
else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
- if ($H < 0) $h++;
- if ($H > 1) $h--;
+ if ($h < 0) $h++;
+ if ($h > 1) $h--;
}
return array($h, $s, $v);
diff --git a/include/errorhandler.php b/include/errorhandler.php
index 9acef2357..52431c2de 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -6,7 +6,8 @@ function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
- return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+ if (class_exists("Logger"))
+ return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
}
function ttrss_fatal_handler() {
@@ -26,7 +27,8 @@ function ttrss_fatal_handler() {
$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
- return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+ if (class_exists("Logger"))
+ return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
}
return false;
diff --git a/include/functions.php b/include/functions.php
index c39b4938c..48bb39d28 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1162,7 +1162,7 @@
$data = array_merge($data, getVirtCounters());
$data = array_merge($data, getLabelCounters());
- $data = array_merge($data, getFeedCounters($active_feed));
+ $data = array_merge($data, getFeedCounters());
$data = array_merge($data, getCategoryCounters());
return $data;
@@ -1286,7 +1286,7 @@
return $unread;
} else if ($cat == -1) {
- return getFeedUnread(-1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0);
+ return getFeedUnread(-1) + getFeedUnread(-2) + getFeedUnread(-3) + getFeedUnread(0);
} else if ($cat == -2) {
$result = db_query("
@@ -1726,7 +1726,8 @@
}
if (!$root_id) {
- $is_selected = ($default_id == "CAT:0") ? "selected=\"1\"" : "";
+ $default_is_cat = ($default_id == "CAT:0");
+ $is_selected = $default_is_cat ? "selected=\"1\"" : "";
printf("<option $is_selected value='CAT:0'>%s</option>",
__("Uncategorized"));
@@ -2844,8 +2845,7 @@
if ($version_data) {
$version_data = json_decode($version_data, true);
if ($version_data && $version_data['version']) {
-
- if (version_compare(VERSION, $version_data['version']) == -1) {
+ if (version_compare(VERSION_STATIC, $version_data['version']) == -1) {
return $version_data;
}
}
@@ -2902,7 +2902,6 @@
ttrss_tags WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
ref_id = '$a_id' AND owner_uid = '$owner_uid' LIMIT 1) ORDER BY tag_name";
- $obj_id = md5("TAGS:$owner_uid:$id");
$tags = array();
/* check cache first */
@@ -3249,7 +3248,7 @@
function print_checkpoint($n, $s) {
$ts = microtime(true);
- echo sprintf("<!-- CP[$n] %.4f seconds -->", $ts - $s);
+ echo sprintf("<!-- CP[$n] %.4f seconds -->\n", $ts - $s);
return $ts;
}
@@ -3392,47 +3391,22 @@
}
function format_tags_string($tags, $id) {
+ if (!is_array($tags) || count($tags) == 0) {
+ return __("no tags");
+ } else {
+ $maxtags = min(5, count($tags));
- $tags_str = "";
- $tags_nolinks_str = "";
-
- $num_tags = 0;
-
- $tag_limit = 6;
-
- $formatted_tags = array();
-
- foreach ($tags as $tag) {
- $num_tags++;
- $tag_escaped = str_replace("'", "\\'", $tag);
-
- if (mb_strlen($tag) > 30) {
- $tag = truncate_string($tag, 30);
- }
-
- $tag_str = "<a href=\"javascript:viewfeed('$tag_escaped')\">$tag</a>";
-
- array_push($formatted_tags, $tag_str);
-
- $tmp_tags_str = implode(", ", $formatted_tags);
-
- if ($num_tags == $tag_limit || mb_strlen($tmp_tags_str) > 150) {
- break;
+ for ($i = 0; $i < $maxtags; $i++) {
+ $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed('".$tags[$i]."'\")>" . $tags[$i] . "</a>, ";
}
- }
- $tags_str = implode(", ", $formatted_tags);
+ $tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
- if ($num_tags < count($tags)) {
- $tags_str .= ", &hellip;";
- }
+ if (count($tags) > $maxtags)
+ $tags_str .= ", &hellip;";
- if ($num_tags == 0) {
- $tags_str = __("no tags");
+ return $tags_str;
}
-
- return $tags_str;
-
}
function format_article_labels($labels, $id) {
@@ -4125,7 +4099,7 @@
preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
$url = trim(str_replace($matches[1],"",$matches[0]));
$url_parsed = parse_url($url);
- return (isset($url_parsed))? geturl($url, $referer):'';
+ return (isset($url_parsed))? geturl($url):'';
}
$oline='';
foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index a5d3898ce..612c914c0 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -160,7 +160,7 @@
// since we have the data cached, we can deal with other feeds with the same url
- $tmp_result = db_query("SELECT DISTINCT ttrss_feeds.id,last_updated
+ $tmp_result = db_query("SELECT DISTINCT ttrss_feeds.id,last_updated,ttrss_feeds.owner_uid
FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
ttrss_users.id = ttrss_user_prefs.owner_uid AND
@@ -173,7 +173,7 @@
if (db_num_rows($tmp_result) > 0) {
while ($tline = db_fetch_assoc($tmp_result)) {
- if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"]);
+ if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
update_rss_feed($tline["id"], true);
++$nf;
}
@@ -193,8 +193,6 @@
function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false,
$override_url = false) {
- require_once "lib/simplepie/simplepie.inc";
-
$debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
_debug("start", $debug_enabled);
@@ -214,6 +212,10 @@
$last_updated = db_fetch_result($result, 0, "last_updated");
$last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp"));
+
+ if (defined('_DISABLE_HTTP_304'))
+ $last_article_timestamp = 0;
+
$owner_uid = db_fetch_result($result, 0, "owner_uid");
$mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result,
0, "mark_unread_on_update"));
@@ -241,15 +243,7 @@
$date_feed_processed = date('Y-m-d H:i');
- $cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".feed";
-
- // Ignore cache if new feed or manual update.
- $cache_age = ($no_cache || is_null($last_updated) || strpos($last_updated, '1970-01-01') === 0) ? 30 : get_feed_update_interval($feed) * 60;
-
- _debug("cache filename: $cache_filename exists: " . file_exists($cache_filename), $debug_enabled);
- _debug("cache age: $cache_age; no cache: $no_cache", $debug_enabled);
-
- $cached_feed_data_hash = false;
+ $cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".xml";
$rss = false;
$rss_hash = false;
@@ -260,21 +254,16 @@
if (file_exists($cache_filename) &&
is_readable($cache_filename) &&
!$auth_login && !$auth_pass &&
- filemtime($cache_filename) > time() - $cache_age) {
+ filemtime($cache_filename) > time() - 30) {
- _debug("using local cache.", $debug_enabled);
+ _debug("using local cache.", $debug_enabled);
- if ($cache_timestamp > $last_article_timestamp) {
- @$rss_data = file_get_contents($cache_filename);
+ @$feed_data = file_get_contents($cache_filename);
+
+ if ($feed_data) {
+ $rss_hash = sha1($feed_data);
+ }
- if ($rss_data) {
- $rss_hash = sha1($rss_data);
- @$rss = unserialize($rss_data);
- }
- } else if (!$force_refetch) {
- _debug("local cache valid and older than last_updated, nothing to do.", $debug_enabled);
- return;
- }
} else {
_debug("local cache will not be used for this feed", $debug_enabled);
}
@@ -345,7 +334,7 @@
}
$pluginhost = new PluginHost();
- $pluginhost->set_debug($debug_enabled, $debug_enabled);
+ $pluginhost->set_debug($debug_enabled);
$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
@@ -356,17 +345,13 @@
$feed_data = $plugin->hook_feed_fetched($feed_data);
}
+ // set last update to now so if anything *simplepie* crashes later we won't be
+ // continuously failing on the same feed
+ //db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'");
+
if (!$rss) {
- $rss = new SimplePie();
- $rss->set_sanitize_class("SanitizeDummy");
- // simplepie ignores the above and creates default sanitizer anyway,
- // so let's override it...
- $rss->sanitize = new SanitizeDummy();
- $rss->set_output_encoding('UTF-8');
- $rss->set_raw_data($feed_data);
- $rss->enable_cache(false);
-
- @$rss->init();
+ $rss = new FeedParser($feed_data);
+ $rss->init();
}
// print_r($rss);
@@ -377,12 +362,11 @@
// cache data for later
if (!$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/simplepie")) {
- $rss_data = serialize($rss);
$new_rss_hash = sha1($rss_data);
- if ($new_rss_hash != $rss_hash) {
+ if ($new_rss_hash != $rss_hash && count($rss->get_items()) > 0 ) {
_debug("saving $cache_filename", $debug_enabled);
- @file_put_contents($cache_filename, serialize($rss));
+ @file_put_contents($cache_filename, $feed_data);
}
}
@@ -414,6 +398,9 @@
$site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
+ _debug("site_url: $site_url", $debug_enabled);
+ _debug("feed_title: " . $rss->get_title(), $debug_enabled);
+
if ($favicon_needs_check || $force_refetch) {
/* terrible hack: if we crash on floicon shit here, we won't check
@@ -424,7 +411,7 @@
_debug("checking favicon...", $debug_enabled);
- check_feed_favicon($site_url, $feed, $link);
+ check_feed_favicon($site_url, $feed);
$favicon_modified_new = @filemtime($favicon_file);
if ($favicon_modified_new > $favicon_modified)
@@ -453,10 +440,12 @@
$feed_title = db_escape_string($rss->get_title());
- _debug("registering title: $feed_title", $debug_enabled);
+ if ($feed_title) {
+ _debug("registering title: $feed_title", $debug_enabled);
- db_query("UPDATE ttrss_feeds SET
- title = '$feed_title' WHERE id = '$feed'");
+ db_query("UPDATE ttrss_feeds SET
+ title = '$feed_title' WHERE id = '$feed'");
+ }
}
if ($site_url && $orig_site_url != $site_url) {
@@ -529,6 +518,8 @@
if (!$entry_guid) $entry_guid = $item->get_link();
if (!$entry_guid) $entry_guid = make_guid_from_title($item->get_title());
+ _debug("f_guid $entry_guid", $debug_enabled);
+
if (!$entry_guid) continue;
$entry_guid = "$owner_uid,$entry_guid";
@@ -539,7 +530,9 @@
$entry_timestamp = "";
- $entry_timestamp = strtotime($item->get_date());
+ $entry_timestamp = $item->get_date();
+
+ _debug("orig date: " . $item->get_date(), $debug_enabled);
if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
$entry_timestamp = time();
@@ -552,8 +545,9 @@
_debug("date $entry_timestamp [$entry_timestamp_fmt]", $debug_enabled);
- $entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
- $entry_title = decode_numeric_entities($entry_title);
+// $entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
+// $entry_title = decode_numeric_entities($entry_title);
+ $entry_title = $item->get_title();
$entry_link = rewrite_relative_url($site_url, $item->get_link());
@@ -571,30 +565,19 @@
print "\n";
}
- $entry_comments = $item->data["comments"];
-
- if ($item->get_author()) {
- $entry_author_item = $item->get_author();
- $entry_author = $entry_author_item->get_name();
- if (!$entry_author) $entry_author = $entry_author_item->get_email();
- }
+ $entry_comments = $item->get_comments_url();
+ $entry_author = $item->get_author();
$entry_guid = db_escape_string(mb_substr($entry_guid, 0, 245));
$entry_comments = db_escape_string(mb_substr(trim($entry_comments), 0, 245));
$entry_author = db_escape_string(mb_substr(trim($entry_author), 0, 245));
- $num_comments = $item->get_item_tags('http://purl.org/rss/1.0/modules/slash/', 'comments');
-
- if (is_array($num_comments) && is_array($num_comments[0])) {
- $num_comments = (int) $num_comments[0]["data"];
- } else {
- $num_comments = 0;
- }
+ $num_comments = (int) $item->get_comments_count();
_debug("author $entry_author", $debug_enabled);
_debug("num_comments: $num_comments", $debug_enabled);
- _debug("looking for tags [1]...", $debug_enabled);
+ _debug("looking for tags...", $debug_enabled);
// parse <category> entries into tags
@@ -604,18 +587,17 @@
if (is_array($additional_tags_src)) {
foreach ($additional_tags_src as $tobj) {
- array_push($additional_tags, $tobj->get_term());
+ array_push($additional_tags, $tobj);
}
}
- _debug("category tags:", $debug_enabled);
- _debug("looking for tags [2]...", $debug_enabled);
-
$entry_tags = array_unique($additional_tags);
for ($i = 0; $i < count($entry_tags); $i++)
$entry_tags[$i] = mb_strtolower($entry_tags[$i], 'utf-8');
+ _debug("tags found: " . join(",", $entry_tags), $debug_enabled);
+
_debug("done collecting data.", $debug_enabled);
// TODO: less memory-hungry implementation
@@ -1389,15 +1371,4 @@
_debug("Cleaned $rc cached tags.");
}
-
- function utf8_entity_decode($entity){
- $convmap = array(0x0, 0x10000, 0, 0xfffff);
- return mb_decode_numericentity($entity, $convmap, 'UTF-8');
- }
-
- function decode_numeric_entities($body) {
- $body = preg_replace('/&#\d{2,5};/ue', "utf8_entity_decode('$0')", $body );
- $body = preg_replace('/&#x([a-fA-F0-7]{2,8});/ue', "utf8_entity_decode('&#'.hexdec('$1').';')", $body );
- return $body;
- }
?>
diff --git a/include/version.php b/include/version.php
index 0e583f9ec..7396f81e0 100644
--- a/include/version.php
+++ b/include/version.php
@@ -1,5 +1,5 @@
<?php
- define('VERSION_STATIC', '1.7.8');
+ define('VERSION_STATIC', '1.7.9');
function get_version() {
date_default_timezone_set('UTC');
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-15 13:29:28 +0000