Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 03:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace obsolete functionality in "PortableContact"

Browse source
This commit is contained in:
Michael 2019-10-05 23:30:47 +00:00
parent c32fb1547f
commit 8238081d87
6 changed files with 211 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Model/GServer.php
View file

@ -26,6 +26,29 @@ use Friendica\Network\Probe;
*/
class GServer
{
/**
* Checks if the given server is reachable
*
* @param string $profile URL of the given profile
* @param string $server URL of the given server (If empty, taken from profile)
* @param string $network Network value that is used, when detection failed
* @param boolean $force Force an update.
*
* @return boolean 'true' if server seems vital
*/
public static function reachable(string $profile, string $server = '', string $network = '', bool $force = false)
{
if ($server == '') {
$server = Contact::getBasepath($profile);
}
if ($server == '') {
return true;
}
return self::check($server, $network, $force);
}
/**
* Checks the state of the given server.
*
@ -661,21 +684,20 @@ class GServer
private static function detectNetworkViaContacts(string $url, array $serverdata)
{
$contacts = '';
$fields = ['nurl', 'url'];
$gcontacts = DBA::select('gcontact', $fields, ['server_url' => [$url, $serverdata['nurl']]]);
$gcontacts = DBA::select('gcontact', ['url', 'nurl'], ['server_url' => [$url, $serverdata['nurl']]]);
while ($gcontact = DBA::fetch($gcontacts)) {
$contacts[$gcontact['nurl']] = $gcontact['url'];
}
DBA::close($gcontacts);
$apcontacts = DBA::select('apcontact', $fields, ['baseurl' => [$url, $serverdata['nurl']]]);
$apcontacts = DBA::select('apcontact', ['url'], ['baseurl' => [$url, $serverdata['nurl']]]);
while ($gcontact = DBA::fetch($gcontacts)) {
$contacts[$apcontact['nurl']] = $apcontact['url'];
$contacts[Strings::normaliseLink($apcontact['url'])] = $apcontact['url'];
}
DBA::close($apcontacts);
$pcontacts = DBA::select('contact', $fields, ['uid' => 0, 'baseurl' => [$url, $serverdata['nurl']]]);
$pcontacts = DBA::select('contact', ['url', 'nurl'], ['uid' => 0, 'baseurl' => [$url, $serverdata['nurl']]]);
while ($gcontact = DBA::fetch($gcontacts)) {
$contacts[$pcontact['nurl']] = $pcontact['url'];
}