From 35a73b729f4dea95e8a0a40ba672b89f0eadd603 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 16 Oct 2018 13:17:01 +0000
Subject: [PATCH] Onepoll hadn't polled anymore / small relocation in zrlinit
 for better logging

---
 src/Model/Profile.php  | 22 +++++++++++-----------
 src/Worker/OnePoll.php |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index e44ac29519..1f0773cd18 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -1014,15 +1014,6 @@ class Profile
 			return;
 		}
 
-		// Avoid endless loops
-		$cachekey = 'zrlInit:' . $my_url;
-		if (Cache::get($cachekey)) {
-			logger('URL ' . $my_url . ' already tried to authenticate.', LOGGER_DEBUG);
-			return;
-		} else {
-			Cache::set($cachekey, true, CACHE_MINUTE);
-		}
-
 		$arr = ['zrl' => $my_url, 'url' => $a->cmd];
 		Addon::callHooks('zrl_init', $arr);
 
@@ -1033,8 +1024,6 @@ class Profile
 			return;
 		}
 
-		Worker::add(PRIORITY_LOW, 'GProbe', $my_url);
-
 		$contact = DBA::selectFirst('contact',['id', 'url'], ['id' => $cid]);
 
 		if (DBA::isResult($contact) && remote_user() && remote_user() == $contact['id']) {
@@ -1042,8 +1031,19 @@ class Profile
 			return;
 		}
 
+		// Avoid endless loops
+		$cachekey = 'zrlInit:' . $my_url;
+		if (Cache::get($cachekey)) {
+			logger('URL ' . $my_url . ' already tried to authenticate.', LOGGER_DEBUG);
+			return;
+		} else {
+			Cache::set($cachekey, true, CACHE_MINUTE);
+		}
+
 		logger('Not authenticated. Invoking reverse magic-auth for ' . $my_url, LOGGER_DEBUG);
 
+		Worker::add(PRIORITY_LOW, 'GProbe', $my_url);
+
 		// Try to avoid recursion - but send them home to do a proper magic auth.
 		$query = str_replace(array('?zrl=', '&zid='), array('?rzrl=', '&rzrl='), $a->query_string);
 		// The other instance needs to know where to redirect.
diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 3c16af75f8..0066a04aed 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -333,7 +333,7 @@ class OnePoll
 			$curlResult = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]);
 			unlink($cookiejar);
 
-			if (!$curlResult->isTimeout()) {
+			if ($curlResult->isTimeout()) {
 				// set the last-update so we don't keep polling
 				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				Contact::markForArchival($contact);
-- 
2.39.5