valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove debug_enabled global

This commit is contained in:
Andrew Dolgov 2013-04-19 13:42:40 +04:00
parent 9ec103525d
commit 68cccafcad
2 changed files with 66 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/functions.php
View File

@ -129,26 +129,20 @@
$utc_tz = new DateTimeZone('UTC'); $utc_tz = new DateTimeZone('UTC');
$schema_version = false; $schema_version = false;
global $_debug_enabled;
$_debug_enabled = true;
/** /**
* Print a timestamped debug message. * Print a timestamped debug message.
* *
* @param string $msg The debug message. * @param string $msg The debug message.
* @return void * @return void
*/ */
function _debug($msg) { function _debug($msg, $show = true) {
global $_debug_enabled;
if (!$_debug_enabled) return;
$ts = strftime("%H:%M:%S", time()); $ts = strftime("%H:%M:%S", time());
if (function_exists('posix_getpid')) { if (function_exists('posix_getpid')) {
$ts = "$ts/" . posix_getpid(); $ts = "$ts/" . posix_getpid();
} }
if (!(defined('QUIET') && QUIET)) { if ($show && !(defined('QUIET') && QUIET)) {
print "[$ts] $msg\n"; print "[$ts] $msg\n";
} }
@ -163,15 +157,6 @@
} // function _debug } // function _debug
function _debug_enable($enabled) {
global $_debug_enabled;
$old = $_debug_enabled;
$_debug_enabled = $enabled;
return $old;
}
/** /**
* Purge a feed old posts. * Purge a feed old posts.
* *

118
include/rssfuncs.php
View File

@ -201,9 +201,7 @@
$debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']; $debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
$prev_debug_enabled = _debug_enable($debug_enabled); _debug("start", $debug_enabled);
_debug("start");
$result = db_query("SELECT id,update_interval,auth_login, $result = db_query("SELECT id,update_interval,auth_login,
feed_url,auth_pass,cache_images,last_updated, feed_url,auth_pass,cache_images,last_updated,
@ -212,7 +210,7 @@
FROM ttrss_feeds WHERE id = '$feed'"); FROM ttrss_feeds WHERE id = '$feed'");
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
_debug("feed $feed NOT FOUND/SKIPPED"); _debug("feed $feed NOT FOUND/SKIPPED", $debug_enabled);
return false; return false;
} }
@ -250,8 +248,8 @@
$cache_age = ($no_cache || is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ? $cache_age = ($no_cache || is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ?
30 : get_feed_update_interval($feed) * 60; 30 : get_feed_update_interval($feed) * 60;
_debug("cache filename: $cache_filename exists: " . file_exists($cache_filename)); _debug("cache filename: $cache_filename exists: " . file_exists($cache_filename), $debug_enabled);
_debug("cache age: $cache_age; no cache: $no_cache"); _debug("cache age: $cache_age; no cache: $no_cache", $debug_enabled);
$cached_feed_data_hash = false; $cached_feed_data_hash = false;
@ -267,7 +265,7 @@
!$auth_login && !$auth_pass && !$auth_login && !$auth_pass &&
filemtime($cache_filename) > time() - $cache_age) { filemtime($cache_filename) > time() - $cache_age) {
_debug("using local cache."); _debug("using local cache.", $debug_enabled);
if ($cache_timestamp > $last_updated_timestamp) { if ($cache_timestamp > $last_updated_timestamp) {
@$rss_data = file_get_contents($cache_filename); @$rss_data = file_get_contents($cache_filename);
@ -277,7 +275,7 @@
@$rss = unserialize($rss_data); @$rss = unserialize($rss_data);
} }
} else if (!$force_refetch) { } else if (!$force_refetch) {
_debug("local cache valid and older than last_updated, nothing to do."); _debug("local cache valid and older than last_updated, nothing to do.", $debug_enabled);
return; return;
} }
} }
@ -285,7 +283,7 @@
if (!$rss) { if (!$rss) {
if (!$feed_data) { if (!$feed_data) {
_debug("fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)"); _debug("fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)", $debug_enabled);
$feed_data = fetch_file_contents($fetch_url, false, $feed_data = fetch_file_contents($fetch_url, false,
$auth_login, $auth_pass, false, $auth_login, $auth_pass, false,
@ -302,15 +300,16 @@
$feed_data = trim($feed_data); $feed_data = trim($feed_data);
_debug("fetch done."); _debug("fetch done.", $debug_enabled);
if ($feed_data) {
$error = verify_feed_xml($feed_data); $error = verify_feed_xml($feed_data);
if ($error) { if ($error) {
_debug("error verifying XML, code: " . $error->code); _debug("error verifying XML, code: " . $error->code, $debug_enabled);
if ($error->code == 26) { if ($error->code == 26) {
_debug("got error 26, trying to decode entities..."); _debug("got error 26, trying to decode entities...", $debug_enabled);
$feed_data = html_entity_decode($feed_data, ENT_COMPAT, 'UTF-8'); $feed_data = html_entity_decode($feed_data, ENT_COMPAT, 'UTF-8');
@ -320,12 +319,13 @@
} }
} }
} }
}
if (!$feed_data) { if (!$feed_data) {
global $fetch_last_error; global $fetch_last_error;
global $fetch_last_error_code; global $fetch_last_error_code;
_debug("unable to fetch: $fetch_last_error [$fetch_last_error_code]"); _debug("unable to fetch: $fetch_last_error [$fetch_last_error_code]", $debug_enabled);
$error_escaped = ''; $error_escaped = '';
@ -333,7 +333,7 @@
if ($fetch_last_error_code != 304) { if ($fetch_last_error_code != 304) {
$error_escaped = db_escape_string($fetch_last_error); $error_escaped = db_escape_string($fetch_last_error);
} else { } else {
_debug("source claims data not modified, nothing to do."); _debug("source claims data not modified, nothing to do.", $debug_enabled);
} }
db_query( db_query(
@ -345,7 +345,7 @@
} }
$pluginhost = new PluginHost(); $pluginhost = new PluginHost();
$pluginhost->set_debug($debug_enabled); $pluginhost->set_debug($debug_enabled, $debug_enabled);
$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid); $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
$pluginhost->load(PLUGINS, PluginHost::KIND_ALL); $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
@ -381,7 +381,7 @@
$new_rss_hash = sha1($rss_data); $new_rss_hash = sha1($rss_data);
if ($new_rss_hash != $rss_hash) { if ($new_rss_hash != $rss_hash) {
_debug("saving $cache_filename"); _debug("saving $cache_filename", $debug_enabled);
@file_put_contents($cache_filename, serialize($rss)); @file_put_contents($cache_filename, serialize($rss));
} }
} }
@ -389,7 +389,7 @@
// We use local pluginhost here because we need to load different per-user feed plugins // We use local pluginhost here because we need to load different per-user feed plugins
$pluginhost->run_hooks(PluginHost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss); $pluginhost->run_hooks(PluginHost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss);
_debug("processing feed data..."); _debug("processing feed data...", $debug_enabled);
// db_query("BEGIN"); // db_query("BEGIN");
@ -414,7 +414,7 @@
$site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245)); $site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
if ($favicon_needs_check || $force_refetch) { if ($favicon_needs_check || $force_refetch) {
_debug("checking favicon..."); _debug("checking favicon...", $debug_enabled);
check_feed_favicon($site_url, $feed, $link); check_feed_favicon($site_url, $feed, $link);
$favicon_file = ICONS_DIR . "/$feed.ico"; $favicon_file = ICONS_DIR . "/$feed.ico";
@ -437,7 +437,7 @@
$feed_title = db_escape_string($rss->get_title()); $feed_title = db_escape_string($rss->get_title());
_debug("registering title: $feed_title"); _debug("registering title: $feed_title", $debug_enabled);
db_query("UPDATE ttrss_feeds SET db_query("UPDATE ttrss_feeds SET
title = '$feed_title' WHERE id = '$feed'"); title = '$feed_title' WHERE id = '$feed'");
@ -448,17 +448,17 @@
site_url = '$site_url' WHERE id = '$feed'"); site_url = '$site_url' WHERE id = '$feed'");
} }
_debug("loading filters & labels..."); _debug("loading filters & labels...", $debug_enabled);
$filters = load_filters($feed, $owner_uid); $filters = load_filters($feed, $owner_uid);
$labels = get_all_labels($owner_uid); $labels = get_all_labels($owner_uid);
_debug("" . count($filters) . " filters loaded."); _debug("" . count($filters) . " filters loaded.", $debug_enabled);
$items = $rss->get_items(); $items = $rss->get_items();
if (!is_array($items)) { if (!is_array($items)) {
_debug("no articles found."); _debug("no articles found.", $debug_enabled);
db_query("UPDATE ttrss_feeds db_query("UPDATE ttrss_feeds
SET last_updated = NOW(), last_error = '' WHERE id = '$feed'"); SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
@ -468,7 +468,7 @@
if ($pubsub_state != 2 && PUBSUBHUBBUB_ENABLED) { if ($pubsub_state != 2 && PUBSUBHUBBUB_ENABLED) {
_debug("checking for PUSH hub..."); _debug("checking for PUSH hub...", $debug_enabled);
$feed_hub_url = false; $feed_hub_url = false;
@ -481,7 +481,7 @@
} }
} }
_debug("feed hub url: $feed_hub_url"); _debug("feed hub url: $feed_hub_url", $debug_enabled);
if ($feed_hub_url && function_exists('curl_init') && if ($feed_hub_url && function_exists('curl_init') &&
!ini_get("open_basedir")) { !ini_get("open_basedir")) {
@ -495,14 +495,14 @@
$rc = $s->subscribe($fetch_url); $rc = $s->subscribe($fetch_url);
_debug("feed hub url found, subscribe request sent."); _debug("feed hub url found, subscribe request sent.", $debug_enabled);
db_query("UPDATE ttrss_feeds SET pubsub_state = 1 db_query("UPDATE ttrss_feeds SET pubsub_state = 1
WHERE id = '$feed'"); WHERE id = '$feed'");
} }
} }
_debug("processing articles..."); _debug("processing articles...", $debug_enabled);
foreach ($items as $item) { foreach ($items as $item) {
if ($_REQUEST['xdebug'] == 3) { if ($_REQUEST['xdebug'] == 3) {
@ -519,7 +519,7 @@
$entry_guid_hashed = db_escape_string('SHA1:' . sha1($entry_guid)); $entry_guid_hashed = db_escape_string('SHA1:' . sha1($entry_guid));
_debug("guid $entry_guid / $entry_guid_hashed"); _debug("guid $entry_guid / $entry_guid_hashed", $debug_enabled);
$entry_timestamp = ""; $entry_timestamp = "";
@ -534,14 +534,14 @@
$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp); $entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
_debug("date $entry_timestamp [$entry_timestamp_fmt]"); _debug("date $entry_timestamp [$entry_timestamp_fmt]", $debug_enabled);
$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8'); $entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
$entry_link = rewrite_relative_url($site_url, $item->get_link()); $entry_link = rewrite_relative_url($site_url, $item->get_link());
_debug("title $entry_title"); _debug("title $entry_title", $debug_enabled);
_debug("link $entry_link"); _debug("link $entry_link", $debug_enabled);
if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);; if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
@ -575,9 +575,9 @@
$num_comments = 0; $num_comments = 0;
} }
_debug("author $entry_author"); _debug("author $entry_author", $debug_enabled);
_debug("num_comments: $num_comments"); _debug("num_comments: $num_comments", $debug_enabled);
_debug("looking for tags [1]..."); _debug("looking for tags [1]...", $debug_enabled);
// parse <category> entries into tags // parse <category> entries into tags
@ -591,19 +591,19 @@
} }
} }
_debug("category tags:"); _debug("category tags:", $debug_enabled);
_debug("looking for tags [2]..."); _debug("looking for tags [2]...", $debug_enabled);
$entry_tags = array_unique($additional_tags); $entry_tags = array_unique($additional_tags);
for ($i = 0; $i < count($entry_tags); $i++) for ($i = 0; $i < count($entry_tags); $i++)
$entry_tags[$i] = mb_strtolower($entry_tags[$i], 'utf-8'); $entry_tags[$i] = mb_strtolower($entry_tags[$i], 'utf-8');
_debug("done collecting data."); _debug("done collecting data.", $debug_enabled);
// TODO: less memory-hungry implementation // TODO: less memory-hungry implementation
_debug("applying plugin filters.."); _debug("applying plugin filters..", $debug_enabled);
// FIXME not sure if owner_uid is a good idea here, we may have a base entry without user entry (?) // FIXME not sure if owner_uid is a good idea here, we may have a base entry without user entry (?)
$result = db_query("SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries $result = db_query("SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries
@ -644,7 +644,7 @@
$entry_content = $article["content"]; // escaped below $entry_content = $article["content"]; // escaped below
_debug("plugin data: $entry_plugin_data"); _debug("plugin data: $entry_plugin_data", $debug_enabled);
if ($cache_images && is_writable(CACHE_DIR . '/images')) if ($cache_images && is_writable(CACHE_DIR . '/images'))
cache_images($entry_content, $site_url, $debug_enabled); cache_images($entry_content, $site_url, $debug_enabled);
@ -660,7 +660,7 @@
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
_debug("base guid [$entry_guid] not found"); _debug("base guid [$entry_guid] not found", $debug_enabled);
// base post entry does not exist, create it // base post entry does not exist, create it
@ -728,7 +728,7 @@
if (db_num_rows($result) == 1) { if (db_num_rows($result) == 1) {
_debug("base guid found, checking for user record"); _debug("base guid found, checking for user record", $debug_enabled);
// this will be used below in update handler // this will be used below in update handler
$orig_content_hash = db_fetch_result($result, 0, "content_hash"); $orig_content_hash = db_fetch_result($result, 0, "content_hash");
@ -743,7 +743,7 @@
/* $stored_guid = db_fetch_result($result, 0, "guid"); /* $stored_guid = db_fetch_result($result, 0, "guid");
if ($stored_guid != $entry_guid_hashed) { if ($stored_guid != $entry_guid_hashed) {
if ($debug_enabled) _debug("upgrading compat guid to hashed one"); if ($debug_enabled) _debug("upgrading compat guid to hashed one", $debug_enabled);
db_query("UPDATE ttrss_entries SET guid = '$entry_guid_hashed' WHERE db_query("UPDATE ttrss_entries SET guid = '$entry_guid_hashed' WHERE
id = '$ref_id'"); id = '$ref_id'");
@ -765,7 +765,7 @@
$entry_tags); $entry_tags);
if ($debug_enabled) { if ($debug_enabled) {
_debug("article filters: "); _debug("article filters: ", $debug_enabled);
if (count($article_filters) != 0) { if (count($article_filters) != 0) {
print_r($article_filters); print_r($article_filters);
} }
@ -778,7 +778,7 @@
$score = calculate_article_score($article_filters); $score = calculate_article_score($article_filters);
_debug("initial score: $score"); _debug("initial score: $score", $debug_enabled);
$query = "SELECT ref_id, int_id FROM ttrss_user_entries WHERE $query = "SELECT ref_id, int_id FROM ttrss_user_entries WHERE
ref_id = '$ref_id' AND owner_uid = '$owner_uid' ref_id = '$ref_id' AND owner_uid = '$owner_uid'
@ -791,7 +791,7 @@
// okay it doesn't exist - create user entry // okay it doesn't exist - create user entry
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
_debug("user record not found, creating..."); _debug("user record not found, creating...", $debug_enabled);
if ($score >= -500 && !find_article_filter($article_filters, 'catchup')) { if ($score >= -500 && !find_article_filter($article_filters, 'catchup')) {
$unread = 'true'; $unread = 'true';
@ -825,7 +825,7 @@
$ngram_similar = db_fetch_result($result, 0, "similar"); $ngram_similar = db_fetch_result($result, 0, "similar");
_debug("N-gram similar results: $ngram_similar"); _debug("N-gram similar results: $ngram_similar", $debug_enabled);
if ($ngram_similar > 0) { if ($ngram_similar > 0) {
$unread = 'false'; $unread = 'false';
@ -863,13 +863,13 @@
$entry_int_id = db_fetch_result($result, 0, "int_id"); $entry_int_id = db_fetch_result($result, 0, "int_id");
} }
} else { } else {
_debug("user record FOUND"); _debug("user record FOUND", $debug_enabled);
$entry_ref_id = db_fetch_result($result, 0, "ref_id"); $entry_ref_id = db_fetch_result($result, 0, "ref_id");
$entry_int_id = db_fetch_result($result, 0, "int_id"); $entry_int_id = db_fetch_result($result, 0, "int_id");
} }
_debug("RID: $entry_ref_id, IID: $entry_int_id"); _debug("RID: $entry_ref_id, IID: $entry_int_id", $debug_enabled);
$post_needs_update = false; $post_needs_update = false;
$update_insignificant = false; $update_insignificant = false;
@ -899,7 +899,7 @@
if ($post_needs_update) { if ($post_needs_update) {
if (defined('DAEMON_EXTENDED_DEBUG')) { if (defined('DAEMON_EXTENDED_DEBUG')) {
_debug("post $entry_guid_hashed needs update..."); _debug("post $entry_guid_hashed needs update...", $debug_enabled);
} }
// print "<!-- post $orig_title needs update : $post_needs_update -->"; // print "<!-- post $orig_title needs update : $post_needs_update -->";
@ -923,12 +923,12 @@
db_query("COMMIT"); db_query("COMMIT");
_debug("assigning labels..."); _debug("assigning labels...", $debug_enabled);
assign_article_to_label_filters($entry_ref_id, $article_filters, assign_article_to_label_filters($entry_ref_id, $article_filters,
$owner_uid, $article_labels); $owner_uid, $article_labels);
_debug("looking for enclosures..."); _debug("looking for enclosures...", $debug_enabled);
// enclosures // enclosures
@ -945,7 +945,7 @@
} }
if ($debug_enabled) { if ($debug_enabled) {
_debug("article enclosures:"); _debug("article enclosures:", $debug_enabled);
print_r($enclosures); print_r($enclosures);
} }
@ -1002,7 +1002,7 @@
$filtered_tags = array_unique($filtered_tags); $filtered_tags = array_unique($filtered_tags);
if ($debug_enabled) { if ($debug_enabled) {
_debug("filtered article tags:"); _debug("filtered article tags:", $debug_enabled);
print_r($filtered_tags); print_r($filtered_tags);
} }
@ -1047,7 +1047,7 @@
} }
if (get_pref("AUTO_ASSIGN_LABELS", $owner_uid, false)) { if (get_pref("AUTO_ASSIGN_LABELS", $owner_uid, false)) {
_debug("auto-assigning labels..."); _debug("auto-assigning labels...", $debug_enabled);
foreach ($labels as $label) { foreach ($labels as $label) {
$caption = preg_quote($label["caption"]); $caption = preg_quote($label["caption"]);
@ -1060,15 +1060,15 @@
} }
} }
_debug("article processed"); _debug("article processed", $debug_enabled);
} }
if (!$last_updated) { if (!$last_updated) {
_debug("new feed, catching it up..."); _debug("new feed, catching it up...", $debug_enabled);
catchup_feed($feed, false, $owner_uid); catchup_feed($feed, false, $owner_uid);
} }
_debug("purging feed..."); _debug("purging feed...", $debug_enabled);
purge_feed($feed, 0, $debug_enabled); purge_feed($feed, 0, $debug_enabled);
@ -1081,7 +1081,7 @@
$error_msg = db_escape_string(mb_substr($rss->error(), 0, 245)); $error_msg = db_escape_string(mb_substr($rss->error(), 0, 245));
_debug("error fetching feed: $error_msg"); _debug("error fetching feed: $error_msg", $debug_enabled);
db_query( db_query(
"UPDATE ttrss_feeds SET last_error = '$error_msg', "UPDATE ttrss_feeds SET last_error = '$error_msg',
@ -1090,9 +1090,7 @@
unset($rss); unset($rss);
_debug("done"); _debug("done", $debug_enabled);
_debug_enable($prev_debug_enabled);
} }
function cache_images($html, $site_url, $debug) { function cache_images($html, $site_url, $debug) {