use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\System;
+use Friendica\Core\Logger;
use Friendica\Model\Photo;
use Friendica\Object\Image;
use Friendica\Util\HTTPSignature;
* Sets application instance and checks if /proxy/ path is writable.
*
*/
- public static function init()
+ public static function init(array $parameters = [])
{
// Set application instance here
$a = self::getApp();
$img_str = $fetchResult->getBody();
// If there is an error then return a blank image
- if ((substr($fetchResult->getReturnCode(), 0, 1) == '4') || (!$img_str)) {
+ if ((substr($fetchResult->getReturnCode(), 0, 1) == '4') || empty($img_str)) {
+ Logger::info('Error fetching image', ['image' => $request['url'], 'return' => $fetchResult->getReturnCode(), 'empty' => empty($img_str)]);
self::responseError();
// stop.
}
$image = new Image($img_str, $mime);
if (!$image->isValid()) {
+ Logger::info('The image is invalid', ['image' => $request['url'], 'mime' => $mime]);
self::responseError();
// stop.
}
$url = base64_decode(strtr($url, '-_', '+/'), true);
} else {
- $url = defaults($_REQUEST, 'url', '');
+ $url = $_REQUEST['url'] ?? '';
}
return [
}
/**
- * @brief Output a blank image, without cache headers, in case of errors
+ * In case of an error just stop. We don't return content to avoid caching problems
*
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function responseError()
{
- header('Content-type: image/png');
- echo file_get_contents('images/blank.png');
- exit();
+ throw new \Friendica\Network\HTTPException\InternalServerErrorException();
}
/**
private static function responseImageHttpCache(Image $img)
{
if (is_null($img) || !$img->isValid()) {
+ Logger::info('The cached image is invalid');
self::responseError();
// stop.
}