fix hanged daemon notification

2 files changed, 17 insertions, 6 deletions

diff --git a/functions.php b/functions.php
index 430525754..592272000 100644
--- a/functions.php
+++ b/functions.php
@@ -2702,23 +2702,24 @@
 			print "<param key=\"daemon_is_running\" value=\"".
 				sprintf("%d", file_is_locked("update_daemon.lock")) . "\"/>";
 
-			if ($_SESSION["daemon_stamp_check"] + 600 < time()) {
+			if (time() - $_SESSION["daemon_stamp_check"] > 600) {
 
 				$stamp = (int)read_stampfile("update_daemon.stamp");
 
 				if ($stamp) {
-					if ($stamp + 86400*3 < time()) {
-						print "<param key=\"daemon_stamp_ok\" value=\"0\"/>";
+					if (time() - $stamp > 86400) {
+						$stamp_check = 0;
 					} else {
-						print "<param key=\"daemon_stamp_ok\" value=\"1\"/>";
+						$stamp_check = 1;
+						$_SESSION["daemon_stamp_check"] = time();
 					}
 
+					print "<param key=\"daemon_stamp_ok\" value=\"$stamp_check\"/>";
+
 					$stamp_fmt = date("Y.m.d, G:i", $stamp);
 
 					print "<param key=\"daemon_stamp\" value=\"$stamp_fmt\"/>";
 				}
-
-				$_SESSION["daemon_stamp_check"] = time();
 			}
 		}
 
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 34f6311c9..55ff54f9d 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -12,6 +12,11 @@
 				print __("Update daemon is enabled in configuration, but daemon
 					process is not running, which prevents all feeds from updating. Please
 					start the daemon process or contact instance owner.");
+
+				$stamp = (int)read_stampfile("update_daemon.stamp");
+
+				print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp); 
+
 			}
 
 			if ($param == 2) {
@@ -31,6 +36,11 @@
 					perform a feed update. This could indicate a problem like crash
 					or a hang. Please check the daemon process or contact instance
 					owner.");
+
+				$stamp = (int)read_stampfile("update_daemon.stamp");
+
+				print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp); 
+
 			}
 
 			print "</div>";