more update_daemon work

diff --git a/backend.php b/backend.php
index 55f2fa99f25dd4df2ed01d06d813aeba59bd24d6..5e93c37f8a9090dacb04ecf5e94016fa6a396458 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -702,7 +702,9 @@
                }
 
                if ($subop == "forceUpdateAllFeeds" || $subop == "updateAllFeeds") {
-               
+       
+                       if ($subop == "forceUpdateAllFeeds" && ENABLE_FEED_CATS
+       
                        update_all_feeds($link, $subop == "forceUpdateAllFeeds");                       
 
                        $omode = $_GET["omode"];

diff --git a/update_daemon.php b/update_daemon.php
index 4f30cb53e22ce50ef016d00c6eef6261ec0b30eb..0e5424d43e34a87b6915959a0a860d2fe3721447 100644 (file)
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -48,8 +48,11 @@
                        $upd_intl = get_pref($link, 'DEFAULT_UPDATE_INTERVAL', $user_id);
                }
 
-               if ($fetch || (!$line["last_updated"] || 
-                       time() - strtotime($line["last_updated"]) > ($upd_intl * 60))) {
+#              printf("%d ? %d\n", time() - strtotime($line["last_updated"]) > $upd_intl*60,
+#                      $upd_intl*60);
+
+               if (!$line["last_updated"] || 
+                       time() - strtotime($line["last_updated"]) > ($upd_intl * 60)) {
 
                        print "Updating...\n";
 
@@ -58,7 +61,7 @@
                }
        }
 
-       sleep(SLEEP_INTERVAL);
+//     sleep(SLEEP_INTERVAL);
 
        db_close($link);