more update_daemon work

2 files changed, 9 insertions, 4 deletions

diff --git a/backend.php b/backend.php
index 55f2fa99f..5e93c37f8 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 4f30cb53e..0e5424d43 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);