From d307aa1484a9643fc43d29ee46639d3cc1694d8f Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 18 Oct 2018 02:46:02 +0000 Subject: [PATCH] For test purposes we can now deactivate polling --- config/config.ini.php | 4 ++++ src/Worker/OnePoll.php | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/config.ini.php b/config/config.ini.php index 827439984..ea3df52cb 100644 --- a/config/config.ini.php +++ b/config/config.ini.php @@ -140,6 +140,10 @@ disable_url_validation = false ; Disable the exposition check against the remote haveibeenpwned API on password change. disable_password_exposed = false +; disable_polling (Boolean) +; Disable the polling of DFRN and OStatus contacts through onepoll.php. +disable_polling = false + ; dlogfile (Path) ; location of the developer log file. dlogfile = diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index 0066a04ae..be6d5a549 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -148,6 +148,10 @@ class OnePoll } } + if (!in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) && Config::get('system', 'disable_polling')) { + return; + } + if ($importer_uid == 0) { logger('Ignore public contacts'); @@ -345,7 +349,7 @@ class OnePoll } elseif ($contact['network'] === Protocol::MAIL) { logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG); - $mail_disabled = ((function_exists('imap_open') && (! Config::get('system', 'imap_disabled'))) ? 0 : 1); + $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1); if ($mail_disabled) { // set the last-update so we don't keep polling DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); @@ -541,7 +545,7 @@ class OnePoll if ($datarray['parent-uri'] === $datarray['uri']) { $datarray['private'] = 1; } - if (($contact['network'] === Protocol::MAIL) && (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies'))) { + if (($contact['network'] === Protocol::MAIL) && !PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) { $datarray['private'] = 1; $datarray['allow_cid'] = '<' . $contact['id'] . '>'; }