keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplyfying code

Browse source
This commit is contained in:
Michael 2021-07-05 04:16:02 +00:00
parent 7188ed745c
commit 844727dc19
2 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Proxy.php
View file

@ -40,10 +40,7 @@ class Proxy extends BaseModule
{
/**
* Initializer method for this class.
*
* Sets application instance and checks if /proxy/ path is writable.
*
* Fetch remote image content
*/
public static function rawContent(array $parameters = [])
{
@ -81,8 +78,7 @@ class Proxy extends BaseModule
$fetchResult = HTTPSignature::fetchRaw($request['url'], local_user(), ['timeout' => 10]);
$img_str = $fetchResult->getBody();
// If there is an error then return an error
if ((substr($fetchResult->getReturnCode(), 0, 1) == '4') || empty($img_str)) {
if (!$fetchResult->isSuccess() || empty($img_str)) {
Logger::info('Error fetching image', ['image' => $request['url'], 'return' => $fetchResult->getReturnCode(), 'empty' => empty($img_str)]);
self::responseError();
// stop.

20
src/Util/Proxy.php
View file

@ -87,21 +87,11 @@ class Proxy
*/
public static function proxifyUrl($url, $size = '')
{
// Get application instance
$a = DI::app();
// Trim URL first
$url = trim($url);
// Is no http in front of it?
/// @TODO To weak test for being a valid URL
if (substr($url, 0, 4) !== 'http') {
return $url;
}
// Only continue if it isn't a local image and the isn't deactivated
if (self::isLocalImage($url)) {
$url = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $url);
// Quit if not an HTTP/HTTPS link or if local
if (!in_array(parse_url($url, PHP_URL_SCHEME), ['http', 'https']) || self::isLocalImage($url)) {
return $url;
}
@ -175,11 +165,7 @@ class Proxy
return true;
}
// links normalised - bug #431
$baseurl = Strings::normaliseLink(DI::baseUrl());
$url = Strings::normaliseLink($url);
return (substr($url, 0, strlen($baseurl)) == $baseurl);
return Network::isLocalLink($url);
}
/**