pass logfile to child tasks if locking is possible, lock logfile before writing,...

[tt-rss.git] / include / rssfuncs.php

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index e6866182bb329c3445f14f17c41c32b5b603629e..7f6417759e1a8b7f310414f186d893618275c85e 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -194,6 +194,8 @@
 
                $debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
 
+               if (!$debug_enabled) define('SUPPRESS_DEBUGGING', true);
+
                _debug("start", $debug_enabled);
 
                $result = db_query("SELECT id,update_interval,auth_login,
@@ -574,9 +576,11 @@
 
                                if (count($entry_language) > 0) {
                                        $entry_language = array_keys($entry_language);
-                                       $entry_language = db_escape_string($entry_language[0]);
+                                       $entry_language = db_escape_string(substr($entry_language[0], 0, 2));
 
                                        _debug("detected language: $entry_language", $debug_enabled);
+                               } else{
+                                       $entry_language = "";
                                }
 
                                $entry_comments = $item->get_comments_url();
@@ -642,7 +646,11 @@
                                        "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);
@@ -952,7 +960,7 @@
                                if (is_array($encs)) {
                                        foreach ($encs as $e) {
                                                $e_item = array(
-                                                       $e->link, $e->type, $e->length);
+                                                       $e->link, $e->type, $e->length, $e->title);
                                                array_push($enclosures, $e_item);
                                        }
                                }
@@ -964,10 +972,14 @@
 
                                db_query("BEGIN");
 
+//                             debugging
+//                             db_query("DELETE FROM ttrss_enclosures WHERE post_id = '$entry_ref_id'");
+
                                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]);
+                                       $enc_title = db_escape_string($enc[3]);
 
                                        $result = db_query("SELECT id FROM ttrss_enclosures
                                                WHERE content_url = '$enc_url' AND post_id = '$entry_ref_id'");
@@ -975,7 +987,7 @@
                                        if (db_num_rows($result) == 0) {
                                                db_query("INSERT INTO ttrss_enclosures
                                                        (content_url, content_type, title, duration, post_id) VALUES
-                                                       ('$enc_url', '$enc_type', '', '$enc_dur', '$entry_ref_id')");
+                                                       ('$enc_url', '$enc_type', '$enc_title', '$enc_dur', '$entry_ref_id')");
                                        }
                                }
 
@@ -1379,9 +1391,7 @@
 
                _debug("Cleaned $rc cached tags.");
 
-               foreach ($pluginhost->get_hooks(PluginHost::HOOK_HOUSE_KEEPING) as $plugin) {
-                       $plugin->hook_house_keeping();
-               }
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
 
        }
 ?>