keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Undefined index: nurl in Protocol\PortableContact

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-22 12:50:13 -04:00
parent 41fd5bef13
commit adc47fc8ea
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Protocol/PortableContact.php
View file

@ -1647,27 +1647,33 @@ class PortableContact
$no_of_queries = 5; $no_of_queries = 5;
$requery_days = intval(Config::get("system", "poco_requery_days")); $requery_days = intval(Config::get('system', 'poco_requery_days'));
if ($requery_days == 0) { if ($requery_days == 0) {
$requery_days = 7; $requery_days = 7;
} }
$last_update = date("c", time() - (60 * 60 * 24 * $requery_days)); $last_update = date('c', time() - (60 * 60 * 24 * $requery_days));
$r = q("SELECT `id`, `url`, `nurl`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", DBA::escape($last_update)); $gservers = q("SELECT `id`, `url`, `nurl`, `network`
if (DBA::isResult($r)) { FROM `gserver`
foreach ($r as $server) { WHERE `last_contact` >= `last_failure`
if (!self::checkServer($server["url"], $server["network"])) { AND `poco` != ''
AND `last_poco_query` < '%s'
ORDER BY RAND()", DBA::escape($last_update)
);
if (DBA::isResult($gservers)) {
foreach ($gservers as $gserver) {
if (!self::checkServer($gserver['url'], $gserver['network'])) {
// The server is not reachable? Okay, then we will try it later // The server is not reachable? Okay, then we will try it later
$fields = ['last_poco_query' => DateTimeFormat::utcNow()]; $fields = ['last_poco_query' => DateTimeFormat::utcNow()];
DBA::update('gserver', $fields, ['nurl' => $server["nurl"]]); DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]);
continue; continue;
} }
logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG); logger('Update directory from server ' . $gserver['url'] . ' with ID ' . $gserver['id'], LOGGER_DEBUG);
Worker::add(PRIORITY_LOW, "DiscoverPoCo", "update_server_directory", (int)$server['id']); Worker::add(PRIORITY_LOW, 'DiscoverPoCo', 'update_server_directory', (int) $gserver['id']);
if (!$complete && (--$no_of_queries == 0)) { if (!$complete && ( --$no_of_queries == 0)) {
break; break;
} }
} }