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

Curl Response Refactoring

Browse source 
- extended Curl to parse Curl Response
- refactored Network::curl()
- replaced every Network::curl() execution with the new Curl container
This commit is contained in:
Philipp Holzer 2018-10-10 21:08:43 +02:00
commit 2dec8895a9
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
20 changed files with 466 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Model/APContact.php
View file

@ -33,12 +33,12 @@ class APContact extends BaseObject
$webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
$ret = Network::curl($webfinger, false, $redirects, ['accept_content' => 'application/jrd+json,application/json']);
if (!$ret['success'] || empty($ret['body'])) {
$curlResult = Network::curl($webfinger, false, $redirects, ['accept_content' => 'application/jrd+json,application/json']);
if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
return false;
}
$data = json_decode($ret['body'], true);
$data = json_decode($curlResult->getBody(), true);
if (empty($data['links'])) {
return false;

6
src/Model/GContact.php
View file

@ -957,12 +957,12 @@ class GContact
$url = $server."/main/statistics";
$result = Network::curl($url);
if (!$result["success"]) {
$curlResult = Network::curl($url);
if (!$curlResult->isSuccess()) {
return false;
}
$statistics = json_decode($result["body"]);
$statistics = json_decode($curlResult->getBody());
if (!empty($statistics->config)) {
if ($statistics->config->instance_with_ssl) {

2
src/Model/Profile.php
View file

@ -1056,7 +1056,7 @@ class Profile
if ($basepath != System::baseUrl() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
$magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest;
$serverret = Network::curl($magic_path);
if (!empty($serverret['success'])) {
if ($serverret->isSuccess()) {
goaway($magic_path);
}
}