bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #5950 from annando/no-polling

Browse source 
For test purposes we can now deactivate polling
This commit is contained in:
Hypolite Petovan 2018-10-18 00:43:35 -04:00 committed by GitHub
commit 6d420dfe9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/config.ini.php
View file

@ -140,6 +140,10 @@ disable_url_validation = false
; Disable the exposition check against the remote haveibeenpwned API on password change. ; Disable the exposition check against the remote haveibeenpwned API on password change.
disable_password_exposed = false disable_password_exposed = false
; disable_polling (Boolean)
; Disable the polling of DFRN and OStatus contacts through onepoll.php.
disable_polling = false
; dlogfile (Path) ; dlogfile (Path)
; location of the developer log file. ; location of the developer log file.
dlogfile = dlogfile =

8
src/Worker/OnePoll.php
View file

@ -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) { if ($importer_uid == 0) {
logger('Ignore public contacts'); logger('Ignore public contacts');
@ -345,7 +349,7 @@ class OnePoll
} elseif ($contact['network'] === Protocol::MAIL) { } elseif ($contact['network'] === Protocol::MAIL) {
logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG); 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) { if ($mail_disabled) {
// set the last-update so we don't keep polling // set the last-update so we don't keep polling
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
@ -541,7 +545,7 @@ class OnePoll
if ($datarray['parent-uri'] === $datarray['uri']) { if ($datarray['parent-uri'] === $datarray['uri']) {
$datarray['private'] = 1; $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['private'] = 1;
$datarray['allow_cid'] = '<' . $contact['id'] . '>'; $datarray['allow_cid'] = '<' . $contact['id'] . '>';
} }