function update_feedbrowser_cache() {
$result = db_query("SELECT feed_url, site_url, title, COUNT(id) AS subscribers
- FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
- WHERE tf.feed_url = ttrss_feeds.feed_url
- AND (private IS true OR auth_login != '' OR auth_pass != '' OR feed_url LIKE '%:%@%/%'))
+ FROM ttrss_feeds WHERE feed_url NOT IN (SELECT feed_url FROM ttrss_feeds
+ WHERE private IS true OR auth_login != '' OR auth_pass != '' OR feed_url LIKE '%:%@%/%')
GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT 1000");
db_query("BEGIN");
$auth_login = db_fetch_result($result, 0, "auth_login");
$auth_pass = db_fetch_result($result, 0, "auth_pass");
- if ($auth_pass_encrypted) {
+ if ($auth_pass_encrypted && function_exists("mcrypt_decrypt")) {
require_once "crypt.php";
$auth_pass = decrypt_string($auth_pass);
}
$feed_data = fetch_file_contents($fetch_url, false,
$auth_login, $auth_pass, false,
- FEED_FETCH_TIMEOUT_TIMEOUT,
+ FEED_FETCH_TIMEOUT,
0);
global $fetch_curl_used;
$result = db_query("SELECT title FROM ttrss_feeds
WHERE id = '$feed'");
+
+ if (db_num_rows($result) == 0) {
+ _debug("feed $feed NOT FOUND/SKIPPED", $debug_enabled);
+ user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
+ return false;
+ }
+
$title = db_fetch_result($result, 0, "title");
// feed was batch-subscribed or something, we need to get basic info
feed_language
FROM ttrss_feeds WHERE id = '$feed'");
- if (db_num_rows($result) == 0) {
- _debug("feed $feed NOT FOUND/SKIPPED", $debug_enabled);
- user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
- return false;
- }
-
$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"));
$auth_login = db_fetch_result($result, 0, "auth_login");
$auth_pass = db_fetch_result($result, 0, "auth_pass");
- if ($auth_pass_encrypted) {
+ if ($auth_pass_encrypted && function_exists("mcrypt_decrypt")) {
require_once "crypt.php";
$auth_pass = decrypt_string($auth_pass);
}
if ($feed_hub_url && $feed_self_url && function_exists('curl_init') &&
!ini_get("open_basedir")) {
- require_once 'lib/pubsubhubbub/subscriber.php';
+ require_once 'lib/pubsubhubbub/Subscriber.php';
$callback_url = get_self_url_prefix() .
"/public.php?op=pubsub&id=$feed";
- $s = new Subscriber($feed_hub_url, $callback_url);
+ $s = new Pubsubhubbub\Subscriber\Subscriber($feed_hub_url, $callback_url);
$rc = $s->subscribe($feed_self_url);
print "\n";
}
- $entry_comments = $item->get_comments_url();
- $entry_author = $item->get_author();
+ $entry_comments = db_escape_string(mb_substr($item->get_comments_url(), 0, 245));
+ $num_comments = (int) $item->get_comments_count();
+ $entry_author = $item->get_author(); // escaped later
$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 = (int) $item->get_comments_count();
-
_debug("author $entry_author", $debug_enabled);
_debug("num_comments: $num_comments", $debug_enabled);
_debug("looking for tags...", $debug_enabled);
$entry_tags = $article["tags"];
$entry_guid = db_escape_string($entry_guid);
$entry_title = db_escape_string($article["title"]);
- $entry_author = db_escape_string($article["author"]);
+ $entry_author = db_escape_string(mb_substr($article["author"], 0, 245));
$entry_link = db_escape_string($article["link"]);
$entry_content = $article["content"]; // escaped below
$entry_force_catchup = $article["force_catchup"];
$published = 'false';
}
- // N-grams
-
- /* if (DB_TYPE == "pgsql" and defined('_NGRAM_TITLE_DUPLICATE_THRESHOLD')) {
-
- $result = db_query("SELECT COUNT(*) AS similar FROM
- ttrss_entries,ttrss_user_entries
- WHERE ref_id = id AND updated >= NOW() - INTERVAL '7 day'
- AND similarity(title, '$entry_title') >= "._NGRAM_TITLE_DUPLICATE_THRESHOLD."
- AND owner_uid = $owner_uid");
-
- $ngram_similar = db_fetch_result($result, 0, "similar");
-
- _debug("N-gram similar results: $ngram_similar", $debug_enabled);
-
- if ($ngram_similar > 0) {
- $unread = 'false';
- }
- } */
-
$last_marked = ($marked == 'true') ? 'NOW()' : 'NULL';
$last_published = ($published == 'true') ? 'NOW()' : 'NULL';
"/public.php?op=rss&id=-2&key=" .
get_feed_access_key(-2, false, $owner_uid);
- $p = new Publisher(PUBSUBHUBBUB_HUB);
+ $p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB);
/* $pubsub_result = */ $p->publish_update($rss_link);
}
$doc->loadHTML($charset_hack . $html);
$xpath = new DOMXPath($doc);
- $entries = $xpath->query('(//img[@src])');
+ $entries = $xpath->query('(//img[@src])|(//video/source[@src])');
foreach ($entries as $entry) {
- if ($entry->hasAttribute('src')) {
+ if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) {
$src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
- $local_filename = CACHE_DIR . "/images/" . sha1($src) . ".png";
+ $extension = $entry->tagName == 'source' ? '.mp4' : '.png';
+ $local_filename = CACHE_DIR . "/images/" . sha1($src) . $extension;
if ($debug) _debug("cache_images: downloading: $src to $local_filename");
switch ($rule["type"]) {
case "title":
- $match = @preg_match("/$reg_exp/i", $title);
+ $match = @preg_match("/$reg_exp/iu", $title);
break;
case "content":
// we don't need to deal with multiline regexps
$content = preg_replace("/[\r\n\t]/", "", $content);
- $match = @preg_match("/$reg_exp/i", $content);
+ $match = @preg_match("/$reg_exp/iu", $content);
break;
case "both":
// we don't need to deal with multiline regexps
$content = preg_replace("/[\r\n\t]/", "", $content);
- $match = (@preg_match("/$reg_exp/i", $title) || @preg_match("/$reg_exp/i", $content));
+ $match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
break;
case "link":
- $match = @preg_match("/$reg_exp/i", $link);
+ $match = @preg_match("/$reg_exp/iu", $link);
break;
case "author":
- $match = @preg_match("/$reg_exp/i", $author);
+ $match = @preg_match("/$reg_exp/iu", $author);
break;
case "tag":
foreach ($tags as $tag) {
- if (@preg_match("/$reg_exp/i", $tag)) {
+ if (@preg_match("/$reg_exp/iu", $tag)) {
$match = true;
break;
}