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

Add PortableContact constants

Browse source 
- Fix typo in mod/admin
- Replace deprecated Logger::log calls
This commit is contained in:
Hypolite Petovan 2019-02-08 08:38:13 -05:00
parent b912823ea9
commit 066ad8c01b
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Protocol/PortableContact.php
View file

@ -29,6 +29,11 @@ use Friendica\Util\XML;
class PortableContact
{
const DISABLED = 0;
const USERS = 1;
const USERS_GCONTACTS = 2;
const USERS_GCONTACTS_FALLBACK = 3;
/**
* @brief Fetch POCO data
*
@ -1645,21 +1650,19 @@ class PortableContact
public static function discoverSingleServer($id)
{
$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `id` = %d", intval($id));
$server = DBA::selectFirst('gserver', ['poco', 'nurl', 'url', 'network'], ['id' => $id]);
if (!DBA::isResult($r)) {
if (!DBA::isResult($server)) {
return false;
}
$server = $r[0];
// Discover new servers out there (Works from Friendica version 3.5.2)
self::fetchServerlist($server["poco"]);
// Fetch all users from the other server
$url = $server["poco"] . "/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
Logger::log("Fetch all users from the server " . $server["url"], Logger::DEBUG);
Logger::info("Fetch all users from the server " . $server["url"]);
$curlResult = Network::curl($url);
@ -1670,7 +1673,7 @@ class PortableContact
self::discoverServer($data, 2);
}
if (Config::get('system', 'poco_discovery') > 1) {
if (Config::get('system', 'poco_discovery') >= self::USERS_GCONTACTS) {
$timeframe = Config::get('system', 'poco_discovery_since');
if ($timeframe == 0) {
@ -1687,7 +1690,7 @@ class PortableContact
$curlResult = Network::curl($url);
if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
Logger::log("Fetch all global contacts from the server " . $server["nurl"], Logger::DEBUG);
Logger::info("Fetch all global contacts from the server " . $server["nurl"]);
$data = json_decode($curlResult->getBody(), true);
if (!empty($data)) {