From: Andrew Dolgov <fox@bah.spb.su>
Date: Sat, 11 Feb 2006 14:01:11 +0000 (+0100)
Subject: more update_daemon work
X-Git-Tag: 1.1.3~48
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9d1ef64ea94247e47d0283e83ff7d497f26fbe9d;p=tt-rss.git

more update_daemon work
---

diff --git a/backend.php b/backend.php
index 55f2fa99..5e93c37f 100644
--- 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 4f30cb53..0e5424d4 100644
--- 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);