add multiprocess update daemon

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index 0f3cdefab5ff424cc70a7570cfa17c7cf962ce65..9bd98795b646009b0126868ee3efd06ecf7218ab 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -13,6 +13,7 @@
                                        "auto"  => "Detect automatically",
                                        "en_US" => "English",
                                        "fr_FR" => "Français",
+                                       "nb_NO" => "Norsk Bokmål",
                                        "ru_RU" => "Русский",
                                        "pt_BR" => "Portuguese/Brazil",
                                        "zh_CN" => "Simplified Chinese");
@@ -467,16 +468,26 @@
                        _debug("update_rss_feed: start");
                }
 
-               $result = db_query($link, "SELECT id,update_interval,auth_login,auth_pass,cache_images
-                       FROM ttrss_feeds WHERE id = '$feed'");
+               if (DB_TYPE == "pgsql") {
+                               $updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started >= NOW() - INTERVAL '120 seconds')";
+                       } else {
+                               $updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started >= DATE_SUB(NOW(), INTERVAL 120 SECOND))";
+                       }                       
+
+               $result = db_query($link, "SELECT id,update_interval,auth_login,
+                       auth_pass,cache_images
+                       FROM ttrss_feeds WHERE id = '$feed' AND $updstart_thresh_qpart");
 
                if (db_num_rows($result) == 0) {
                        if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
-                               _debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND");
+                               _debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND/SKIPPED");
                        }               
                        return;
                }
 
+               db_query($link, "UPDATE ttrss_feeds SET last_update_started = NOW()
+                       WHERE id = '$feed'");
+
                $auth_login = db_fetch_result($result, 0, "auth_login");
                $auth_pass = db_fetch_result($result, 0, "auth_pass");
 
@@ -695,6 +706,7 @@
 
                                if ($_GET['xdebug']) {
                                        print_r($item);
+
                                }
 
                                if (ENABLE_SIMPLEPIE) {
@@ -774,6 +786,10 @@
 
                                        if (!$entry_content) $entry_content = $item["content:encoded"];
                                        if (!$entry_content) $entry_content = $item["content"];
+
+                                       // Magpie bugs are getting ridiculous
+                                       if (trim($entry_content) == "Array") $entry_content = false;
+
                                        if (!$entry_content) $entry_content = $item["atom_content"];
                                        if (!$entry_content) $entry_content = $item["summary"];
                                        if (!$entry_content) $entry_content = $item["description"];
@@ -782,12 +798,13 @@
                                        if (is_array($entry_content)) {
                                                $entry_content = $entry_content["encoded"];
                                                if (!$entry_content) $entry_content = $entry_content["escaped"];
-                                       }
+                                       } 
                                }
 
-//                             print_r($item);
-//                             print_r(htmlspecialchars($entry_content));
-//                             print "<br>";
+                               if ($_GET["xdebug"]) {
+                                       print "update_rss_feed: content: ";
+                                       print_r(htmlspecialchars($entry_content));
+                               }
 
                                $entry_content_unescaped = $entry_content;
 
@@ -824,6 +841,7 @@
                                if (preg_match('/^[\t\n\r ]*$/', $entry_author)) $entry_author = '';
 
                                $entry_guid = db_escape_string(strip_tags($entry_guid));
+                               $entry_guid = mb_substr($entry_guid, 0, 250);
 
                                $result = db_query($link, "SELECT id FROM       ttrss_entries 
                                        WHERE guid = '$entry_guid'");
@@ -851,7 +869,7 @@
 
                                        $additional_tags = array();
                                        $additional_tags_src = $item->get_categories();
-
+                                       
                                        if (is_array($additional_tags_src)) {
                                                foreach ($additional_tags_src as $tobj) {
                                                        array_push($additional_tags, $tobj->get_term());
@@ -911,11 +929,13 @@
                                if (ENABLE_SIMPLEPIE) {
                                        $encs = $item->get_enclosures();
 
-                                       foreach ($encs as $e) {
-                                               $e_item = array(
-                                                       $e->link, $e->type, $e->length);
-
-                                               array_push($enclosures, $e_item);
+                                       if (is_array($encs)) {
+                                               foreach ($encs as $e) {
+                                                       $e_item = array(
+                                                               $e->link, $e->type, $e->length);
+       
+                                                       array_push($enclosures, $e_item);
+                                               }
                                        }
 
                                } else {
@@ -1554,10 +1574,15 @@
                        $pwd_hash1 = encrypt_password($password);
                        $pwd_hash2 = encrypt_password($password, $login);
 
-                       if ($force_auth && defined('_DEBUG_USER_SWITCH')) {
+                       if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH 
+                                       && $_SERVER["REMOTE_USER"]) {
+
+                               $login = db_escape_string($_SERVER["REMOTE_USER"]);
+
                                $query = "SELECT id,login,access_level
                    FROM ttrss_users WHERE
-                        login = '$login'";
+                                       login = '$login'";
+
                        } else {
                                $query = "SELECT id,login,access_level,pwd_hash
                    FROM ttrss_users WHERE
@@ -1844,7 +1869,7 @@
        function file_is_locked($filename) {
                if (function_exists('flock')) {
                        error_reporting(0);
-                       $fp = fopen($filename, "r");
+                       $fp = fopen(LOCK_DIRECTORY . "/$filename", "r");
                        error_reporting(DEFAULT_ERROR_LEVEL);
                        if ($fp) {
                                if (flock($fp, LOCK_EX | LOCK_NB)) {
@@ -1860,7 +1885,7 @@
        }
 
        function make_lockfile($filename) {
-               $fp = fopen($filename, "w");
+               $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
 
                if (flock($fp, LOCK_EX | LOCK_NB)) {            
                        return $fp;
@@ -1870,7 +1895,7 @@
        }
 
        function make_stampfile($filename) {
-               $fp = fopen($filename, "w");
+               $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
 
                if (flock($fp, LOCK_EX | LOCK_NB)) {
                        fwrite($fp, time() . "\n");
@@ -1885,7 +1910,7 @@
        function read_stampfile($filename) {
 
                error_reporting(0);
-               $fp = fopen($filename, "r");
+               $fp = fopen(LOCK_DIRECTORY . "/$filename", "r");
                error_reporting (DEFAULT_ERROR_LEVEL);
 
                if (flock($fp, LOCK_EX)) {
@@ -2826,6 +2851,9 @@
                print "<param key=\"icons_location\" value=\"" . 
                        ICONS_URL . "\"/>";
 
+               print "<param key=\"hide_read_shows_special\" value=\"" . 
+                       (int) get_pref($link, "HIDE_READ_SHOWS_SPECIAL") . "\"/>";
+
                print "</init-params>";
        }
 
@@ -3716,7 +3744,7 @@
                                                <li onclick=\"$tog_published_link\">".__('Published')."</li>
                                                </ul></li>
                                        <li class=\"vsep\">&nbsp;</li>
-                                       <li class=\"top\"><a href=\"$catchup_page_link\">".__('Mark as read')."</a><ul>
+                                       <li class=\"top\">".__('Mark as read')."<ul>
                                                <li onclick=\"$catchup_sel_link\">".__('Selection')."</li>
                                                <!-- <li onclick=\"$catchup_page_link\">".__('This page')."</li> -->
                                                <li><span class=\"insensitive\">--------</span></li>
@@ -4513,6 +4541,8 @@
        function outputHeadlinesList($link, $feed, $subop, $view_mode, $limit, $cat_view,
                                        $next_unread_feed, $offset) {
 
+               $disable_cache = false;
+
                $timing_info = getmicrotime();
 
                $topmost_article_ids = array();
@@ -4580,6 +4610,11 @@
                /// START /////////////////////////////////////////////////////////////////////////////////
 
                $search = db_escape_string($_GET["query"]);
+
+               if ($search) { 
+                       $disable_cache = true;
+               }
+
                $search_mode = db_escape_string($_GET["search_mode"]);
                $match_on = db_escape_string($_GET["match_on"]);
 
@@ -4946,7 +4981,7 @@
                        print "</div>";
                }
 
-               return array($topmost_article_ids, $headlines_count);
+               return array($topmost_article_ids, $headlines_count, $feed, $disable_cache);
        }
 
 // from here: http://www.roscripts.com/Create_tag_cloud-71.html