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

Review update

Browse source 
Rename function, move others
This commit is contained in:
Adam Magness 2018-01-27 11:13:41 -05:00
parent 0f1be37279
commit f04d40a37e
55 changed files with 331 additions and 326 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/Protocol/PortableContact.php
View file

@ -85,7 +85,7 @@ class PortableContact
logger('load: ' . $url, LOGGER_DEBUG);
$s = Network::fetchURL($url);
$s = Network::fetchUrl($url);
logger('load: returns ' . $s, LOGGER_DATA);
@ -287,7 +287,7 @@ class PortableContact
}
// Fetch the host-meta to check if this really is a server
$serverret = Network::zFetchURL($server_url."/.well-known/host-meta");
$serverret = Network::curl($server_url."/.well-known/host-meta");
if (!$serverret["success"]) {
return "";
}
@ -366,7 +366,7 @@ class PortableContact
$server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($server_url)));
if ($server) {
$noscraperet = Network::zFetchURL($server[0]["noscrape"]."/".$gcontacts[0]["nick"]);
$noscraperet = Network::curl($server[0]["noscrape"]."/".$gcontacts[0]["nick"]);
if ($noscraperet["success"] && ($noscraperet["body"] != "")) {
$noscrape = json_decode($noscraperet["body"], true);
@ -480,7 +480,7 @@ class PortableContact
GContact::update($contact);
$feedret = Network::zFetchURL($data["poll"]);
$feedret = Network::curl($data["poll"]);
if (!$feedret["success"]) {
$fields = ['last_failure' => datetime_convert()];
@ -631,7 +631,7 @@ class PortableContact
*/
private static function fetchNodeinfo($server_url)
{
$serverret = Network::zFetchURL($server_url."/.well-known/nodeinfo");
$serverret = Network::curl($server_url."/.well-known/nodeinfo");
if (!$serverret["success"]) {
return false;
}
@ -663,7 +663,7 @@ class PortableContact
return false;
}
$serverret = Network::zFetchURL($nodeinfo_url);
$serverret = Network::curl($nodeinfo_url);
if (!$serverret["success"]) {
return false;
}
@ -872,7 +872,7 @@ class PortableContact
$server_url = str_replace("http://", "https://", $server_url);
// We set the timeout to 20 seconds since this operation should be done in no time if the server was vital
$serverret = Network::zFetchURL($server_url."/.well-known/host-meta", false, $redirects, ['timeout' => 20]);
$serverret = Network::curl($server_url."/.well-known/host-meta", false, $redirects, ['timeout' => 20]);
// Quit if there is a timeout.
// But we want to make sure to only quit if we are mostly sure that this server url fits.
@ -889,7 +889,7 @@ class PortableContact
$server_url = str_replace("https://", "http://", $server_url);
// We set the timeout to 20 seconds since this operation should be done in no time if the server was vital
$serverret = Network::zFetchURL($server_url."/.well-known/host-meta", false, $redirects, ['timeout' => 20]);
$serverret = Network::curl($server_url."/.well-known/host-meta", false, $redirects, ['timeout' => 20]);
// Quit if there is a timeout
if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) {
@ -925,7 +925,7 @@ class PortableContact
// Look for poco
if (!$failure) {
$serverret = Network::zFetchURL($server_url."/poco");
$serverret = Network::curl($server_url."/poco");
if ($serverret["success"]) {
$data = json_decode($serverret["body"]);
if (isset($data->totalResults)) {
@ -951,7 +951,7 @@ class PortableContact
if (!$failure) {
// Test for Diaspora, Hubzilla, Mastodon or older Friendica servers
$serverret = Network::zFetchURL($server_url);
$serverret = Network::curl($server_url);
if (!$serverret["success"] || ($serverret["body"] == "")) {
$failure = true;
@ -990,7 +990,7 @@ class PortableContact
// Test for Statusnet
// Will also return data for Friendica and GNU Social - but it will be overwritten later
// The "not implemented" is a special treatment for really, really old Friendica versions
$serverret = Network::zFetchURL($server_url."/api/statusnet/version.json");
$serverret = Network::curl($server_url."/api/statusnet/version.json");
if ($serverret["success"] && ($serverret["body"] != '{"error":"not implemented"}') &&
($serverret["body"] != '') && (strlen($serverret["body"]) < 30)) {
$platform = "StatusNet";
@ -1001,7 +1001,7 @@ class PortableContact
}
// Test for GNU Social
$serverret = Network::zFetchURL($server_url."/api/gnusocial/version.json");
$serverret = Network::curl($server_url."/api/gnusocial/version.json");
if ($serverret["success"] && ($serverret["body"] != '{"error":"not implemented"}') &&
($serverret["body"] != '') && (strlen($serverret["body"]) < 30)) {
$platform = "GNU Social";
@ -1013,7 +1013,7 @@ class PortableContact
// Test for Mastodon
$orig_version = $version;
$serverret = Network::zFetchURL($server_url."/api/v1/instance");
$serverret = Network::curl($server_url."/api/v1/instance");
if ($serverret["success"] && ($serverret["body"] != '')) {
$data = json_decode($serverret["body"]);
@ -1036,7 +1036,7 @@ class PortableContact
if (!$failure) {
// Test for Hubzilla and Red
$serverret = Network::zFetchURL($server_url."/siteinfo.json");
$serverret = Network::curl($server_url."/siteinfo.json");
if ($serverret["success"]) {
$data = json_decode($serverret["body"]);
if (isset($data->url)) {
@ -1064,7 +1064,7 @@ class PortableContact
}
} else {
// Test for Hubzilla, Redmatrix or Friendica
$serverret = Network::zFetchURL($server_url."/api/statusnet/config.json");
$serverret = Network::curl($server_url."/api/statusnet/config.json");
if ($serverret["success"]) {
$data = json_decode($serverret["body"]);
if (isset($data->site->server)) {
@ -1119,7 +1119,7 @@ class PortableContact
// Query statistics.json. Optional package for Diaspora, Friendica and Redmatrix
if (!$failure) {
$serverret = Network::zFetchURL($server_url."/statistics.json");
$serverret = Network::curl($server_url."/statistics.json");
if ($serverret["success"]) {
$data = json_decode($serverret["body"]);
@ -1181,10 +1181,10 @@ class PortableContact
// Check for noscrape
// Friendica servers could be detected as OStatus servers
if (!$failure && in_array($network, [NETWORK_DFRN, NETWORK_OSTATUS])) {
$serverret = Network::zFetchURL($server_url."/friendica/json");
$serverret = Network::curl($server_url."/friendica/json");
if (!$serverret["success"]) {
$serverret = Network::zFetchURL($server_url."/friendika/json");
$serverret = Network::curl($server_url."/friendika/json");
}
if ($serverret["success"]) {
@ -1294,7 +1294,7 @@ class PortableContact
*/
private static function fetchServerlist($poco)
{
$serverret = Network::zFetchURL($poco."/@server");
$serverret = Network::curl($poco."/@server");
if (!$serverret["success"]) {
return;
}
@ -1343,7 +1343,7 @@ class PortableContact
if (!empty($accesstoken)) {
$api = 'https://instances.social/api/1.0/instances/list?count=0';
$header = ['Authorization: Bearer '.$accesstoken];
$serverdata = Network::zFetchURL($api, false, $redirects, ['headers' => $header]);
$serverdata = Network::curl($api, false, $redirects, ['headers' => $header]);
if ($serverdata['success']) {
$servers = json_decode($serverdata['body']);
foreach ($servers->instances as $server) {
@ -1360,7 +1360,7 @@ class PortableContact
//if (!Config::get('system','ostatus_disabled')) {
// $serverdata = "http://gstools.org/api/get_open_instances/";
// $result = Network::zFetchURL($serverdata);
// $result = Network::curl($serverdata);
// if ($result["success"]) {
// $servers = json_decode($result["body"]);
@ -1389,7 +1389,7 @@ class PortableContact
logger("Fetch all users from the server ".$server["url"], LOGGER_DEBUG);
$retdata = Network::zFetchURL($url);
$retdata = Network::curl($url);
if ($retdata["success"]) {
$data = json_decode($retdata["body"]);
@ -1408,7 +1408,7 @@ class PortableContact
$success = false;
$retdata = Network::zFetchURL($url);
$retdata = Network::curl($url);
if ($retdata["success"]) {
logger("Fetch all global contacts from the server ".$server["nurl"], LOGGER_DEBUG);
$success = self::discoverServer(json_decode($retdata["body"]));
@ -1493,7 +1493,7 @@ class PortableContact
// Fetch all contacts from a given user from the other server
$url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
$retdata = Network::zFetchURL($url);
$retdata = Network::curl($url);
if ($retdata["success"]) {
self::discoverServer(json_decode($retdata["body"]), 3);
}