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

Make "HTTPRequest::curl" dynamic

Browse source
This commit is contained in:
nupplaPhil 2020-03-04 22:15:46 +01:00 • committed by Hypolite Petovan
commit 2973ed6448
20 changed files with 72 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Model/GContact.php
View file

@ -36,7 +36,6 @@ use Friendica\Network\Probe;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\PortableContact;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
/**
@ -846,7 +845,7 @@ class GContact
return false;
}
$curlResult = HTTPRequest::curl($gserver['noscrape'] . '/' . $data['nick']);
$curlResult = DI::httpRequest()->curl($gserver['noscrape'] . '/' . $data['nick']);
if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
$noscrape = json_decode($curlResult->getBody(), true);
@ -928,7 +927,7 @@ class GContact
private static function updateFromFeed(array $data)
{
// Search for the newest entry in the feed
$curlResult = HTTPRequest::curl($data['poll']);
$curlResult = DI::httpRequest()->curl($data['poll']);
if (!$curlResult->isSuccess()) {
$fields = ['failed' => true, 'last_failure' => DateTimeFormat::utcNow()];
DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
@ -1206,7 +1205,7 @@ class GContact
$url = $server . '/main/statistics';
$curlResult = HTTPRequest::curl($url);
$curlResult = DI::httpRequest()->curl($url);
if (!$curlResult->isSuccess()) {
return false;
}

36
src/Model/GServer.php
View file

@ -310,7 +310,7 @@ class GServer
// When a nodeinfo is present, we don't need to dig further
$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
$curlResult = HTTPRequest::curl($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
$curlResult = DI::httpRequest()->curl($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
if ($curlResult->isTimeout()) {
self::setFailure($url);
return false;
@ -343,7 +343,7 @@ class GServer
$basedata = ['detection-method' => self::DETECT_MANUAL];
}
$curlResult = HTTPRequest::curl($baseurl, false, ['timeout' => $xrd_timeout]);
$curlResult = DI::httpRequest()->curl($baseurl, false, ['timeout' => $xrd_timeout]);
if ($curlResult->isSuccess()) {
$basedata = self::analyseRootHeader($curlResult, $basedata);
$basedata = self::analyseRootBody($curlResult, $basedata, $baseurl);
@ -499,7 +499,7 @@ class GServer
{
Logger::info('Discover relay data', ['server' => $server_url]);
$curlResult = HTTPRequest::curl($server_url . '/.well-known/x-social-relay');
$curlResult = DI::httpRequest()->curl($server_url . '/.well-known/x-social-relay');
if (!$curlResult->isSuccess()) {
return;
}
@ -580,7 +580,7 @@ class GServer
*/
private static function fetchStatistics(string $url)
{
$curlResult = HTTPRequest::curl($url . '/statistics.json');
$curlResult = DI::httpRequest()->curl($url . '/statistics.json');
if (!$curlResult->isSuccess()) {
return [];
}
@ -690,7 +690,7 @@ class GServer
*/
private static function parseNodeinfo1(string $nodeinfo_url)
{
$curlResult = HTTPRequest::curl($nodeinfo_url);
$curlResult = DI::httpRequest()->curl($nodeinfo_url);
if (!$curlResult->isSuccess()) {
return [];
@ -767,7 +767,7 @@ class GServer
*/
private static function parseNodeinfo2(string $nodeinfo_url)
{
$curlResult = HTTPRequest::curl($nodeinfo_url);
$curlResult = DI::httpRequest()->curl($nodeinfo_url);
if (!$curlResult->isSuccess()) {
return [];
}
@ -844,7 +844,7 @@ class GServer
*/
private static function fetchSiteinfo(string $url, array $serverdata)
{
$curlResult = HTTPRequest::curl($url . '/siteinfo.json');
$curlResult = DI::httpRequest()->curl($url . '/siteinfo.json');
if (!$curlResult->isSuccess()) {
return $serverdata;
}
@ -913,7 +913,7 @@ class GServer
private static function validHostMeta(string $url)
{
$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
$curlResult = HTTPRequest::curl($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
$curlResult = DI::httpRequest()->curl($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
if (!$curlResult->isSuccess()) {
return false;
}
@ -1009,7 +1009,7 @@ class GServer
{
$serverdata['poco'] = '';
$curlResult = HTTPRequest::curl($url . '/poco');
$curlResult = DI::httpRequest()->curl($url . '/poco');
if (!$curlResult->isSuccess()) {
return $serverdata;
}
@ -1039,7 +1039,7 @@ class GServer
*/
public static function checkMastodonDirectory(string $url, array $serverdata)
{
$curlResult = HTTPRequest::curl($url . '/api/v1/directory?limit=1');
$curlResult = DI::httpRequest()->curl($url . '/api/v1/directory?limit=1');
if (!$curlResult->isSuccess()) {
return $serverdata;
}
@ -1066,7 +1066,7 @@ class GServer
*/
private static function detectNextcloud(string $url, array $serverdata)
{
$curlResult = HTTPRequest::curl($url . '/status.php');
$curlResult = DI::httpRequest()->curl($url . '/status.php');
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
@ -1100,7 +1100,7 @@ class GServer
*/
private static function detectMastodonAlikes(string $url, array $serverdata)
{
$curlResult = HTTPRequest::curl($url . '/api/v1/instance');
$curlResult = DI::httpRequest()->curl($url . '/api/v1/instance');
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
@ -1166,7 +1166,7 @@ class GServer
*/
private static function detectHubzilla(string $url, array $serverdata)
{
$curlResult = HTTPRequest::curl($url . '/api/statusnet/config.json');
$curlResult = DI::httpRequest()->curl($url . '/api/statusnet/config.json');
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
}
@ -1264,7 +1264,7 @@ class GServer
private static function detectGNUSocial(string $url, array $serverdata)
{
// Test for GNU Social
$curlResult = HTTPRequest::curl($url . '/api/gnusocial/version.json');
$curlResult = DI::httpRequest()->curl($url . '/api/gnusocial/version.json');
if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
$serverdata['platform'] = 'gnusocial';
@ -1282,7 +1282,7 @@ class GServer
}
// Test for Statusnet
$curlResult = HTTPRequest::curl($url . '/api/statusnet/version.json');
$curlResult = DI::httpRequest()->curl($url . '/api/statusnet/version.json');
if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
@ -1318,9 +1318,9 @@ class GServer
*/
private static function detectFriendica(string $url, array $serverdata)
{
$curlResult = HTTPRequest::curl($url . '/friendica/json');
$curlResult = DI::httpRequest()->curl($url . '/friendica/json');
if (!$curlResult->isSuccess()) {
$curlResult = HTTPRequest::curl($url . '/friendika/json');
$curlResult = DI::httpRequest()->curl($url . '/friendika/json');
$friendika = true;
$platform = 'Friendika';
} else {
@ -1653,7 +1653,7 @@ class GServer
if (!empty($accesstoken)) {
$api = 'https://instances.social/api/1.0/instances/list?count=0';
$header = ['Authorization: Bearer '.$accesstoken];
$curlResult = HTTPRequest::curl($api, false, ['headers' => $header]);
$curlResult = DI::httpRequest()->curl($api, false, ['headers' => $header]);
if ($curlResult->isSuccess()) {
$servers = json_decode($curlResult->getBody(), true);

3
src/Model/Photo.php
View file

@ -28,7 +28,6 @@ use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\DI;
use Friendica\Model\Storage\SystemResource;
use Friendica\Network\HTTPRequest;
use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
@ -421,7 +420,7 @@ class Photo
$filename = basename($image_url);
if (!empty($image_url)) {
$ret = HTTPRequest::curl($image_url, true);
$ret = DI::httpRequest()->curl($image_url, true);
$img_str = $ret->getBody();
$type = $ret->getContentType();
} else {

3
src/Model/Profile.php
View file

@ -33,7 +33,6 @@ use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Network\HTTPRequest;
use Friendica\Protocol\Activity;
use Friendica\Protocol\Diaspora;
use Friendica\Util\DateTimeFormat;
@ -738,7 +737,7 @@ class Profile
$magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
// We have to check if the remote server does understand /magic without invoking something
$serverret = HTTPRequest::curl($basepath . '/magic');
$serverret = DI::httpRequest()->curl($basepath . '/magic');
if ($serverret->isSuccess()) {
Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG);
System::externalRedirect($magic_path);