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

3
mod/ostatus_subscribe.php
View file

@ -23,7 +23,6 @@ use Friendica\App;
use Friendica\Core\Protocol;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Network\HTTPRequest;
function ostatus_subscribe_content(App $a)
{
@ -55,7 +54,7 @@ function ostatus_subscribe_content(App $a)
$api = $contact['baseurl'] . '/api/';
// Fetching friends
$curlResult = HTTPRequest::curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
$curlResult = DI::httpRequest()->curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
if (!$curlResult->isSuccess()) {
DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');

3
mod/parse_url.php
View file

@ -28,7 +28,6 @@ use Friendica\Content\PageInfo;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Network\HTTPRequest;
use Friendica\Util\ParseUrl;
use Friendica\Util\Strings;
@ -85,7 +84,7 @@ function parse_url_content(App $a)
// Check if the URL is an image, video or audio file. If so format
// the URL with the corresponding BBCode media tag
// Fetch the header of the URL
$curlResponse = HTTPRequest::curl($url, false, ['novalidate' => true, 'nobody' => true]);
$curlResponse = DI::httpRequest()->curl($url, false, ['novalidate' => true, 'nobody' => true]);
if ($curlResponse->isSuccess()) {
// Convert the header fields into an array

3
mod/redir.php
View file

@ -27,7 +27,6 @@ use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Network\HTTPRequest;
use Friendica\Util\Strings;
function redir_init(App $a) {
@ -171,7 +170,7 @@ function redir_magic($a, $cid, $url)
}
// Test for magic auth on the target system
$serverret = HTTPRequest::curl($basepath . '/magic');
$serverret = DI::httpRequest()->curl($basepath . '/magic');
if ($serverret->isSuccess()) {
$separator = strpos($target_url, '?') ? '&' : '?';
$target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);