oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-11 17:44:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move post/curl/fetchUrl/fetchUrlFull to own class "Network\HTTPRequest"

Browse source
This commit is contained in:
nupplaPhil 2020-03-04 22:07:05 +01:00 • committed by Hypolite Petovan
parent 2889d59b83
commit 5344efef71
43 changed files with 528 additions and 485 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Worker/CheckVersion.php
View file

@ -24,7 +24,7 @@ namespace Friendica\Worker;
use Friendica\Core\Logger;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Util\Network;
use Friendica\Network\HTTPRequest;
/**
* Check the git repository VERSION file and save the version to the DB
@ -55,7 +55,7 @@ class CheckVersion
Logger::log("Checking VERSION from: ".$checked_url, Logger::DEBUG);
// fetch the VERSION file
$gitversion = DBA::escape(trim(Network::fetchUrl($checked_url)));
$gitversion = DBA::escape(trim(HTTPRequest::fetchUrl($checked_url)));
Logger::log("Upstream VERSION is: ".$gitversion, Logger::DEBUG);
DI::config()->set('system', 'git_friendica_version', $gitversion);

6
src/Worker/CronJobs.php
View file

@ -30,12 +30,10 @@ use Friendica\Database\PostUpdate;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\GServer;
use Friendica\Model\Nodeinfo;
use Friendica\Model\Photo;
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Util\Network;
use Friendica\Network\HTTPRequest;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
@ -63,7 +61,7 @@ class CronJobs
// Now trying to register
$url = 'http://the-federation.info/register/' . DI::baseUrl()->getHostname();
Logger::debug('Check registering url', ['url' => $url]);
$ret = Network::fetchUrl($url);
$ret = HTTPRequest::fetchUrl($url);
Logger::debug('Check registering answer', ['answer' => $ret]);
Logger::info('cron_end');
break;

4
src/Worker/Directory.php
View file

@ -26,7 +26,7 @@ use Friendica\Core\Logger;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Util\Network;
use Friendica\Network\HTTPRequest;
/**
* Sends updated profile data to the directory
@ -54,7 +54,7 @@ class Directory
Logger::log('Updating directory: ' . $arr['url'], Logger::DEBUG);
if (strlen($arr['url'])) {
Network::fetchUrl($dir . '?url=' . bin2hex($arr['url']));
HTTPRequest::fetchUrl($dir . '?url=' . bin2hex($arr['url']));
}
return;

10
src/Worker/OnePoll.php
View file

@ -28,13 +28,13 @@ use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\User;
use Friendica\Network\HTTPRequest;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Email;
use Friendica\Protocol\Feed;
use Friendica\Protocol\PortableContact;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML;
@ -291,7 +291,7 @@ class OnePoll
. '&type=data&last_update=' . $last_update
. '&perm=' . $perm;
$curlResult = Network::curl($url);
$curlResult = HTTPRequest::curl($url);
if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) {
// set the last-update so we don't keep polling
@ -405,7 +405,7 @@ class OnePoll
$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
$postvars['perm'] = 'rw';
return Network::post($contact['poll'], $postvars)->getBody();
return HTTPRequest::post($contact['poll'], $postvars)->getBody();
}
/**
@ -444,7 +444,7 @@ class OnePoll
}
$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
$curlResult = Network::curl($contact['poll'], false, ['cookiejar' => $cookiejar]);
$curlResult = HTTPRequest::curl($contact['poll'], false, ['cookiejar' => $cookiejar]);
unlink($cookiejar);
if ($curlResult->isTimeout()) {
@ -756,7 +756,7 @@ class OnePoll
DBA::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
}
$postResult = Network::post($url, $params);
$postResult = HTTPRequest::post($url, $params);
Logger::log('subscribe_to_hub: returns: ' . $postResult->getReturnCode(), Logger::DEBUG);

4
src/Worker/PubSubPublish.php
View file

@ -25,8 +25,8 @@ use Friendica\Core\Logger;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\PushSubscriber;
use Friendica\Network\HTTPRequest;
use Friendica\Protocol\OStatus;
use Friendica\Util\Network;
class PubSubPublish
{
@ -68,7 +68,7 @@ class PubSubPublish
Logger::log('POST ' . print_r($headers, true) . "\n" . $params, Logger::DATA);
$postResult = Network::post($subscriber['callback_url'], $params, $headers);
$postResult = HTTPRequest::post($subscriber['callback_url'], $params, $headers);
$ret = $postResult->getReturnCode();
if ($ret >= 200 && $ret <= 299) {

4
src/Worker/SearchDirectory.php
View file

@ -30,7 +30,7 @@ use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\GServer;
use Friendica\Util\Network;
use Friendica\Network\HTTPRequest;
use Friendica\Util\Strings;
class SearchDirectory
@ -52,7 +52,7 @@ class SearchDirectory
}
}
$x = Network::fetchUrl(Search::getGlobalDirectory() . '/lsearch?p=1&n=500&search=' . urlencode($search));
$x = HTTPRequest::fetchUrl(Search::getGlobalDirectory() . '/lsearch?p=1&n=500&search=' . urlencode($search));
$j = json_decode($x);
if (!empty($j->results)) {