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

Move z_fetch_url

Browse source 
move z_fetch_url method
This commit is contained in:
Adam Magness 2018-01-26 23:18:38 -05:00
commit 2f9642392d
14 changed files with 58 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Util/ExAuth.php
View file

@ -38,9 +38,9 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
use Friendica\Model\User;
use Friendica\Util\Network;
use dba;
require_once 'include/dba.php';
require_once 'include/dba.php';
class ExAuth
@ -181,7 +181,7 @@ class ExAuth
$url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user;
$data = z_fetch_url($url);
$data = Network::zFetchURL($url);
if (!is_array($data)) {
return false;

2
src/Util/Network.php
View file

@ -233,7 +233,7 @@ class Network
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
$redirects++;
@curl_close($ch);
return z_fetch_url($newurl, $binary, $redirects, $opts);
return self::zFetchURL($newurl, $binary, $redirects, $opts);
}
}

3
src/Util/ParseUrl.php
View file

@ -8,6 +8,7 @@ namespace Friendica\Util;
use Friendica\Content\OEmbed;
use Friendica\Core\Addon;
use Friendica\Object\Image;
use Friendica\Util\Network;
use Friendica\Util\XML;
use dba;
@ -145,7 +146,7 @@ class ParseUrl
$siteinfo["url"] = $url;
$siteinfo["type"] = "link";
$data = z_fetch_url($url);
$data = Network::zFetchURL($url);
if (!$data['success']) {
return($siteinfo);
}