From 07b96f2430a7e1b2f4f80fa4daa6c6111b2546ca Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 18 Jul 2016 22:33:26 -0700 Subject: runaway cron emails --- boot.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/boot.php b/boot.php index b4a54e180..7974ce9ed 100755 --- a/boot.php +++ b/boot.php @@ -2457,24 +2457,16 @@ function check_cron_broken() { set_config('system','lastcroncheck',datetime_convert()); return; } - $t = get_config('system','lastcroncheck'); - if($t === false) { - // This is serious. Config storage isn't working. - // We just set lastcroncheck. The system is horked. - // However don't add insult to injury by sending an email - // to the admin every time a page is accessed. - // just quietly - return; - } if($t > datetime_convert('UTC','UTC','now - 3 days')) { // Wait for 3 days before we do anything so as not to swamp the admin with messages return; } + set_config('system','lastcroncheck',datetime_convert()); + if(($d) && ($d > datetime_convert('UTC','UTC','now - 3 days'))) { // Scheduled tasks have run successfully in the last 3 days. - set_config('system','lastcroncheck',datetime_convert()); return; } -- cgit v1.2.3 From ca82b45fe41ad4ff511959dc2e85c55efcb68bc0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 20 Jul 2016 20:43:12 +0200 Subject: fix /mail wsod issue reported by giac hellvecio --- Zotlabs/Zot/Finger.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php index 229fda8bd..e7603442f 100644 --- a/Zotlabs/Zot/Finger.php +++ b/Zotlabs/Zot/Finger.php @@ -28,7 +28,7 @@ class Finger { if (strpos($webbie,'@') === false) { $address = $webbie; - $host = App::get_hostname(); + $host = \App::get_hostname(); } else { $address = substr($webbie,0,strpos($webbie,'@')); $host = substr($webbie,strpos($webbie,'@')+1); @@ -127,4 +127,4 @@ class Finger { return $x; } -} \ No newline at end of file +} -- cgit v1.2.3