new option: DAEMON_UPDATE_LOGIN_LIMIT

diff --git a/config.php-dist b/config.php-dist
index e72e52911a0842bd2933181d7489551eb9e7a8ee..61a3226b8614bb3990d09189d9f1987655fae4a3 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -120,5 +120,9 @@
        // Expected config version. Please updated this option in config.php
        // if necessary (after migrating all new options from this file).
 
+       define('DAEMON_UPDATE_LOGIN_LIMIT', 30);
+       // Stop updating feeds of user who was never logged in
+       // in specified amount of days. 0 disables.
+
        // vim:ft=php
 ?>

diff --git a/update_daemon.php b/update_daemon.php
index d61ed69f12766ec2dd532af7abdbd94d30431818..a6fb5461d58d09eacef8b48d9825244212763914 100644 (file)
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -75,12 +75,44 @@
 
                $random_qpart = sql_random_function();
 
-               $result = db_query($link, "SELECT feed_url,id,owner_uid,
-                       SUBSTRING(last_updated,1,19) AS last_updated,
-                       update_interval FROM ttrss_feeds ORDER BY $random_qpart DESC");
+/*             
+                                       ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
+                       }
+
+                       $rows = pg_affected_rows($result);
+                       
+               } else {
+
+                       $result = db_query($link, "DELETE FROM ttrss_user_entries 
+                               USING ttrss_user_entries, ttrss_entries 
+                               WHERE ttrss_entries.id = ref_id AND 
+                               marked = false AND 
+                               feed_id = '$feed_id' AND 
+                               ttrss_entries.date_entered < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */                
+               
+               if (DAEMON_UPDATE_LOGIN_LIMIT > 0) {
+                       if (DB_TYPE == "pgsql") {
+                               $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
+                       } else {
+                               $login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
+                       }                       
+               } else {
+                       $login_thresh_qpart = "";
+               }
+
+               $result = db_query($link, "SELECT feed_url,ttrss_feeds.id,owner_uid,
+                               SUBSTRING(last_updated,1,19) AS last_updated,
+                               update_interval 
+                       FROM 
+                               ttrss_feeds,ttrss_users 
+                       WHERE 
+                               ttrss_users.id = owner_uid $login_thresh_qpart 
+                       ORDER BY $random_qpart DESC");
 
                $user_prefs_cache = array();
 
+               printf("Scheduled %d feeds to update...\n", db_num_rows($result));
+               
                while ($line = db_fetch_assoc($result)) {
        
                        $upd_intl = $line["update_interval"];