$login_thresh_qpart = "";
}
- // Test if the feed need a update (update interval exceded).
+ // Test if the feed need a update (update interval exceeded).
if (DB_TYPE == "pgsql") {
$update_limit_qpart = "AND ((
ttrss_feeds.update_interval = 0
) OR (
ttrss_feeds.update_interval > 0
AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
- ) OR ttrss_feeds.last_updated IS NULL
- OR last_updated = '1970-01-01 00:00:00')";
+ ) OR (ttrss_feeds.last_updated IS NULL
+ AND ttrss_user_prefs.value != '-1')
+ OR (last_updated = '1970-01-01 00:00:00'
+ AND ttrss_user_prefs.value != '-1'))";
} else {
$update_limit_qpart = "AND ((
ttrss_feeds.update_interval = 0
) OR (
ttrss_feeds.update_interval > 0
AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
- ) OR ttrss_feeds.last_updated IS NULL
- OR last_updated = '1970-01-01 00:00:00')";
+ ) OR (ttrss_feeds.last_updated IS NULL
+ AND ttrss_user_prefs.value != '-1')
+ OR (last_updated = '1970-01-01 00:00:00'
+ AND ttrss_user_prefs.value != '-1'))";
}
// Test if feed is currently being updated by another process.
ttrss_feeds, ttrss_users, ttrss_user_prefs
WHERE
ttrss_feeds.owner_uid = ttrss_users.id
+ AND ttrss_user_prefs.profile IS NULL
AND ttrss_users.id = ttrss_user_prefs.owner_uid
AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
$login_thresh_qpart $update_limit_qpart
ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
ttrss_users.id = ttrss_user_prefs.owner_uid AND
ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND
+ ttrss_user_prefs.profile IS NULL AND
feed_url = '".db_escape_string($feed)."' AND
(ttrss_feeds.update_interval > 0 OR
ttrss_user_prefs.value != '-1')
ORDER BY ttrss_feeds.id $query_limit");
if (db_num_rows($tmp_result) > 0) {
+ $rss = false;
+
while ($tline = db_fetch_assoc($tmp_result)) {
if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
- update_rss_feed($tline["id"], true);
+
+ $rss = update_rss_feed($tline["id"], true, false, $rss);
+ _debug_suppress(false);
++$nf;
}
}
} // function update_daemon_common
// ignore_daemon is not used
- function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false) {
+ function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false, $rss = false) {
$debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
+ _debug_suppress(!$debug_enabled);
_debug("start", $debug_enabled);
$result = db_query("SELECT id,update_interval,auth_login,
- feed_url,auth_pass,cache_images,last_updated,
+ feed_url,auth_pass,cache_images,
mark_unread_on_update, owner_uid,
pubsub_state, auth_pass_encrypted,
(SELECT max(date_entered) FROM
return false;
}
- $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'))
$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
$pluginhost->load_data();
- $rss = false;
- $rss_hash = false;
+ if ($rss && is_object($rss) && get_class($rss) == "FeedParser") {
+ _debug("using previously initialized parser object");
+ } else {
+ $rss_hash = false;
- $force_refetch = isset($_REQUEST["force_refetch"]);
+ $force_refetch = isset($_REQUEST["force_refetch"]);
- if (file_exists($cache_filename) &&
- is_readable($cache_filename) &&
- !$auth_login && !$auth_pass &&
- filemtime($cache_filename) > time() - 30) {
+ if (file_exists($cache_filename) &&
+ is_readable($cache_filename) &&
+ !$auth_login && !$auth_pass &&
+ filemtime($cache_filename) > time() - 30) {
- _debug("using local cache.", $debug_enabled);
+ _debug("using local cache.", $debug_enabled);
- @$feed_data = file_get_contents($cache_filename);
+ @$feed_data = file_get_contents($cache_filename);
- if ($feed_data) {
- $rss_hash = sha1($feed_data);
- }
+ if ($feed_data) {
+ $rss_hash = sha1($feed_data);
+ }
- } else {
- _debug("local cache will not be used for this feed", $debug_enabled);
+ } else {
+ _debug("local cache will not be used for this feed", $debug_enabled);
+ }
}
if (!$rss) {
$rss->init();
}
- require_once "lib/languagedetect/LanguageDetect.php";
+ if (DETECT_ARTICLE_LANGUAGE) {
+ require_once "lib/languagedetect/LanguageDetect.php";
- $lang = new Text_LanguageDetect();
- $lang->setNameMode(2);
+ $lang = new Text_LanguageDetect();
+ $lang->setNameMode(2);
+ }
// print_r($rss);
// cache data for later
if (!$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/simplepie")) {
- $new_rss_hash = sha1($rss_data);
+ $new_rss_hash = sha1($feed_data);
if ($new_rss_hash != $rss_hash && count($rss->get_items()) > 0 ) {
_debug("saving $cache_filename", $debug_enabled);
_debug("feed hub url: $feed_hub_url", $debug_enabled);
- if ($feed_hub_url && function_exists('curl_init') &&
+ $feed_self_url = $fetch_url;
+
+ $links = $rss->get_links('self');
+
+ if ($links && is_array($links)) {
+ foreach ($links as $l) {
+ $feed_self_url = $l;
+ break;
+ }
+ }
+
+ _debug("feed self url = $feed_self_url");
+
+ if ($feed_hub_url && $feed_self_url && function_exists('curl_init') &&
!ini_get("open_basedir")) {
require_once 'lib/pubsubhubbub/subscriber.php';
$s = new Subscriber($feed_hub_url, $callback_url);
- $rc = $s->subscribe($fetch_url);
+ $rc = $s->subscribe($feed_self_url);
- _debug("feed hub url found, subscribe request sent.", $debug_enabled);
+ _debug("feed hub url found, subscribe request sent. [rc=$rc]", $debug_enabled);
db_query("UPDATE ttrss_feeds SET pubsub_state = 1
WHERE id = '$feed'");
if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
$entry_timestamp = time();
- $no_orig_date = 'true';
- } else {
- $no_orig_date = 'false';
}
$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
print "\n";
}
- $entry_language = $lang->detect($entry_content, 1);
+ $entry_language = "";
- if (count($entry_language) > 0) {
- $entry_language = array_keys($entry_language);
- $entry_language = db_escape_string(substr($entry_language[0], 0, 2));
+ if (DETECT_ARTICLE_LANGUAGE) {
+ $entry_language = $lang->detect($entry_title . " " . $entry_content, 1);
- _debug("detected language: $entry_language", $debug_enabled);
- } else{
- $entry_language = "";
+ if (count($entry_language) > 0) {
+ $entry_language = array_keys($entry_language);
+
+ // the fuck?
+ if (is_array($entry_language))
+ $entry_language = "";
+ else
+ $entry_language = db_escape_string(substr($entry_language[0], 0, 2));
+
+ _debug("detected language: $entry_language", $debug_enabled);
+ }
}
$entry_comments = $item->get_comments_url();
"tags" => $entry_tags,
"plugin_data" => $entry_plugin_data,
"author" => $entry_author,
- "stored" => $stored_article);
+ "stored" => $stored_article,
+ "feed" => array("id" => $feed,
+ "fetch_url" => $fetch_url,
+ "site_url" => $site_url)
+ );
foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
$article = $plugin->hook_article_filter($article);
'$entry_timestamp_fmt',
'$entry_content',
'$content_hash',
- $no_orig_date,
+ false,
NOW(),
'$date_feed_processed',
'$entry_comments',
// now it should exist, if not - bad luck then
$result = db_query("SELECT
- id,content_hash,no_orig_date,title,plugin_data,guid,
- ".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated,
- ".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
+ id,content_hash,title,plugin_data,guid,
num_comments
FROM
ttrss_entries
$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_updated = strtotime(db_fetch_result($result,
- 0, "date_updated"));
$orig_plugin_data = db_fetch_result($result, 0, "plugin_data");
$ref_id = db_fetch_result($result, 0, "id");
$p = new Publisher(PUBSUBHUBBUB_HUB);
- $pubsub_result = $p->publish_update($rss_link);
+ /* $pubsub_result = */ $p->publish_update($rss_link);
}
$result = db_query(
$error_msg = db_escape_string(mb_substr($rss->error(), 0, 245));
- _debug("error fetching feed: $error_msg", $debug_enabled);
+ _debug("fetch error: $error_msg", $debug_enabled);
+
+ if (count($rss->errors()) > 1) {
+ foreach ($rss->errors() as $error) {
+ _debug("+ $error");
+ }
+ }
db_query(
"UPDATE ttrss_feeds SET last_error = '$error_msg',
- last_updated = NOW() WHERE id = '$feed'");
- }
+ last_updated = NOW() WHERE id = '$feed'");
- unset($rss);
+ unset($rss);
+ }
_debug("done", $debug_enabled);
+
+ return $rss;
}
function cache_images($html, $site_url, $debug) {
- $cache_dir = CACHE_DIR . "/images";
-
libxml_use_internal_errors(true);
$charset_hack = '<head>